| commit | 4e0765671f93fa7b762bdb6143a9c014429a0b85 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 08 19:42:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 19:42:36 2014 +0000 |
| tree | 458095fb47f93f99fcec64c78a5800a4fb9309a1 | |
| parent | efe7a7e32688bab33759848f457c51d1fc41fd1d [diff] | |
| parent | a356f33a3eec32d4c291171ee63d5b68e67548e1 [diff] |
am a356f33a: (-s ours) am 1dacd19e: (-s ours) Import translations. DO NOT MERGE * commit 'a356f33a3eec32d4c291171ee63d5b68e67548e1': Import translations. DO NOT MERGE