commit | 97c441b189286d51893fdf25c21745ef264f2766 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Fri May 29 15:03:04 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 29 15:03:04 2015 +0000 |
tree | cb0be3e9be2e653dd369ef8440653b7c45cf0633 | |
parent | 219d7c42af5d8f72ff16c617fd8f96b5faaa1b48 [diff] | |
parent | 0bdf1aab31d110b9e9de819e34e922f13442bf53 [diff] |
am 0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '0bdf1aab31d110b9e9de819e34e922f13442bf53': Import translations. DO NOT MERGE