| commit | 4e18bf8c3900416dcbc8cce554e71571147ba663 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Thu Aug 27 14:28:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:28:38 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 441972f5240c36079aa2ce152cccd1f63d0cc10d [diff] | |
| parent | fc3c4acf3e5fef2de8eaae50f8f1b4ace1c365b9 [diff] |
am 5f1b750d: am 62b3f91d: (-s ours) am bff40697: am addf7a96: Merge "init: Let property_get return std::string." * commit '5f1b750de92cd8d8436a0a0664e2b02d53000102':