| commit | 90f4df6d40767e033aa49b4d5190f939c8b59d3f | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Thu Aug 27 11:52:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:52:06 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 9bc0fe6ade2542e9e63439c342e1a59245ec1fbe [diff] | |
| parent | 1a69ed6b6e7a459bf6b05366c5cfdcee452838c7 [diff] |
am 12e77877: (-s ours) am ba0f24c7: am 5573e3d8: Merge "init: replace strdup() in parse_config()" * commit '12e77877e6fa3ddecf6a3e6c7d66fc72af272a98':