commit | 401b9e8e67d15f08adb31b41f71b7ba7b6458ee2 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Jun 11 01:31:32 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 11 01:31:32 2015 +0000 |
tree | b8c3760124209a7b55285d8d6e8f4773bbdc321c | |
parent | ec58d6b6f8404314824c6623fd89d8546512b111 [diff] | |
parent | 1f428ace1b1e667dc1528543324048afaf918ed4 [diff] |
am 1f428ace: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '1f428ace1b1e667dc1528543324048afaf918ed4': Import translations. DO NOT MERGE