am 12e77877: (-s ours) am ba0f24c7: am 5573e3d8: Merge "init: replace strdup() in parse_config()"

* commit '12e77877e6fa3ddecf6a3e6c7d66fc72af272a98':
This commit is contained in:
Tom Cherry 2015-08-27 11:52:06 +00:00 committed by Android Git Automerger
commit 3c9b4dd2fa

Diff content is not available