| commit | 924319c2e5bd09a95685ef10bb2eb8b15ad07e58 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 27 14:29:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 27 14:29:09 2015 +0000 |
| tree | 997f38d93ab911d669d7b0b42876b74811320690 | |
| parent | 9fca530e3f4491efb5945a2eae44d0899710410b [diff] | |
| parent | 855184113cfd367c7b4d5700bf342ad9141e988e [diff] |
am 85518411: (-s ours) am 3a5edd9f: (-s ours) am 4cd6da53: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '855184113cfd367c7b4d5700bf342ad9141e988e': Import translations. DO NOT MERGE