| commit | 37af77d3751d43c3f32b22c4393ed841fa81f5b5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 16:55:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 16:55:46 2015 +0000 |
| tree | 999ec56c09b7f188e75f6dcb40b3b779a0cb60f2 | |
| parent | 158ce5ce84e4226118e8e2102cb712cfd77dfb21 [diff] | |
| parent | 6c6e53886a82df478ba89152a55289e461afb5c7 [diff] |
am 6c6e5388: (-s ours) am c9692826: (-s ours) Import translations. DO NOT MERGE * commit '6c6e53886a82df478ba89152a55289e461afb5c7': Import translations. DO NOT MERGE