commit | 337ba7c3ac2733af22fa90f4e16d5375d3de2122 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu May 21 13:57:46 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 21 13:57:46 2015 +0000 |
tree | 721ef5cfb97956de98dde31c1c45bc2e4d3c144b | |
parent | e84251c3665c945ba26348185a9165de005e21ae [diff] | |
parent | 9b8d23fb8efec702f2d2940ddaf924896763e047 [diff] |
am 2ab7e0d5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '2ab7e0d5f97b3269e6c8cc810a8031e337873208': Import translations. DO NOT MERGE