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