| commit | e45179a2afad7c9b679e5242a0606ec342538c82 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:08:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:08:37 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | 4a44f43348b593c2e49d6c7c38aa987ba4cc5d6b [diff] | |
| parent | a6d8425760ff3e10f3351545ac7e01e8626fdd8c [diff] |
am a6d84257: (-s ours) am 1aceaa3c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'a6d8425760ff3e10f3351545ac7e01e8626fdd8c': Import translations. DO NOT MERGE