| commit | f1ad264cf8ee8e0ca2f79c13618f4218bab560b1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 17 14:19:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 14:19:03 2015 +0000 |
| tree | 9cbacdecbb6a49ff4ca1d0cfbc6168f62a39a208 | |
| parent | b5ca40c6442c4f30b79dcd202bb9fecc65ba436c [diff] | |
| parent | 7533cd473df2acf79c874f40123865d554434b90 [diff] |
am 7533cd47: (-s ours) am 3c274207: (-s ours) Import translations. DO NOT MERGE * commit '7533cd473df2acf79c874f40123865d554434b90': Import translations. DO NOT MERGE