| commit | 6d83051a790a6bba55df7c9d4508381ac588b33a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Sep 07 15:58:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 07 15:58:44 2015 +0000 |
| tree | 2a4d5f5933bb1ca8fa57142b597306c8d2b1811f | |
| parent | 5c47601d6ddf4afb0d10a47e9457e14a47d0f827 [diff] | |
| parent | a5b6e120e4e88f405aac6dc5d9eb57dbc1673288 [diff] |
am a5b6e120: (-s ours) am 953c6a4a: (-s ours) am 024fb4d4: (-s ours) am 9f3e169c: (-s ours) Import translations. DO NOT MERGE * commit 'a5b6e120e4e88f405aac6dc5d9eb57dbc1673288': Import translations. DO NOT MERGE