commit | ce5c1ac8f8c56692b1df38141b17ecc4f68a47ce | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:11:05 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:11:05 2015 +0000 |
tree | 00150c1f0a37179b532304998dbf8827467018df | |
parent | faa4706fea2e0ef423c7cd6619dff6df2970c800 [diff] | |
parent | f841432ec61400f0c53c1720809b4e4f1bb9d917 [diff] |
am f841432e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit 'f841432ec61400f0c53c1720809b4e4f1bb9d917': Import translations. DO NOT MERGE