| commit | d0944a08c2127b3bc1eb91d426fbf3ea6ea68681 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu May 14 06:38:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 14 06:38:46 2015 +0000 |
| tree | 77104658e91a12ad4d3222adc2f4fc8b5a5b0d7e | |
| parent | 062d39b5edb7c0aa121a0d450a47f4e5fb1580a7 [diff] | |
| parent | d98a0554426f4fa2820e2b3a7a0744459c572057 [diff] |
am d98a0554: (-s ours) am 39ab347f: (-s ours) Import translations. DO NOT MERGE * commit 'd98a0554426f4fa2820e2b3a7a0744459c572057': Import translations. DO NOT MERGE