| commit | 336786438d509025f66162fc6ffbcf029d47176b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sun Nov 02 19:57:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 19:57:45 2014 +0000 |
| tree | 088bfa5952105c4f36dd842e1703418060bb19e3 | |
| parent | af0995c25374da2467a13a5755b856d801c97031 [diff] | |
| parent | e877ad6e54ab6121f59b36a9ea851a77bdd4918e [diff] |
am e877ad6e: (-s ours) am d9704227: (-s ours) am f9f0c347: (-s ours) am 6083ed0f: (-s ours) Import translations. DO NOT MERGE * commit 'e877ad6e54ab6121f59b36a9ea851a77bdd4918e': Import translations. DO NOT MERGE