| commit | 642daa69ac89ea2b2bb30651ef90c2178c8a4547 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 12:19:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:19:03 2015 +0000 |
| tree | a5dfa9d1f9fd23340911dd5dd9a26067ef5f6915 | |
| parent | aea25cf729473034de89c96a66b159bc916c56db [diff] | |
| parent | 514364438451192fba1f0b024b96415e2bf0cfce [diff] |
am 51436443: (-s ours) am cd64ce87: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '514364438451192fba1f0b024b96415e2bf0cfce':