| commit | c9f7a624bd7d58b7be3a80659aa91ddba80e5b97 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:31:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:31:51 2015 +0000 |
| tree | cee3dfbd0a2df6ca7e9a8559c1a24d2b1bb4339a | |
| parent | 9b398e7aa7c041b04cda50f2dcc0fcc222c23a86 [diff] | |
| parent | d7f908cc51be2a1643f5d631be683f4437c5a828 [diff] |
am d7f908cc: (-s ours) am daefa41d: (-s ours) Import translations. DO NOT MERGE * commit 'd7f908cc51be2a1643f5d631be683f4437c5a828': Import translations. DO NOT MERGE