| commit | 3c750334e264df895bf92e3791c7f10521aafde3 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Thu Aug 27 14:34:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:34:08 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | d5f6f8ad9bab688e6d5963ab2d5644d71873ee7e [diff] | |
| parent | 90f4df6d40767e033aa49b4d5190f939c8b59d3f [diff] |
am 3c9b4dd2: am 12e77877: (-s ours) am ba0f24c7: am 5573e3d8: Merge "init: replace strdup() in parse_config()" * commit '3c9b4dd2faf33f1de20e5a6699e96e165ed5e5c9':