| commit | fc3c4acf3e5fef2de8eaae50f8f1b4ace1c365b9 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Thu Aug 27 11:43:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:43:58 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | f4faf61a59eea9e12a55ffada3e40197fc767023 [diff] | |
| parent | c0cf9a63825cb4a70eb1772d7a82069989f05088 [diff] |
am 62b3f91d: (-s ours) am bff40697: am addf7a96: Merge "init: Let property_get return std::string." * commit '62b3f91d142e8c0b698729d3d7f3f4a9b8924c2f':