| commit | fddbd8f95835c232ae8fa17a50a04fcdab8d2ee9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:20 2015 +0000 |
| tree | 9d7ef395c014cbd5c851b9eed1b7323875b89bff | |
| parent | ee010a74d13b1443a870b37c489b54a60664c5b2 [diff] | |
| parent | 4a3664267eccf6069b67433d0caff529210c2367 [diff] |
am 4a366426: (-s ours) am ab87b786: (-s ours) Import translations. DO NOT MERGE * commit '4a3664267eccf6069b67433d0caff529210c2367': Import translations. DO NOT MERGE