| commit | a74496734bf2a2761c198d75c986dd3fd4d8920b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:28:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:28:33 2015 +0000 |
| tree | edb91ce7e7c9dc6d33389277e2e2adcac1d36854 | |
| parent | 2cef65fb15974f2b0a7cf0be7bef2e9200e0312d [diff] | |
| parent | 6b6db80ca0eb058c8af0ff98c6b89022829d5cc4 [diff] |
am 6b6db80c: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '6b6db80ca0eb058c8af0ff98c6b89022829d5cc4':