| commit | 138b7732d6f7aba234cb5e35a8282273cb91b717 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 14 12:46:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 12:46:52 2015 +0000 |
| tree | 7fe0def001ba78bf27f89c81456e891787fb2a23 | |
| parent | 39b467482d1bf256a111c757e9b7621c6f523271 [diff] | |
| parent | a1641e814370f0f2bdfb241de249f9a8e10200a9 [diff] |
am a1641e81: (-s ours) am e3e4bd7f: (-s ours) am 54158bc7: (-s ours) am d1ba8f73: (-s ours) am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE * commit 'a1641e814370f0f2bdfb241de249f9a8e10200a9': Import translations. DO NOT MERGE