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

* commit '3c9b4dd2faf33f1de20e5a6699e96e165ed5e5c9':
This commit is contained in:
Tom Cherry 2015-08-27 14:34:08 +00:00 committed by Android Git Automerger
commit c8230fc0bc

Diff content is not available