| commit | 5dbfdb9324951a6cf3dd1490089d6b8f778df08b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 03 18:46:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 03 18:46:14 2015 +0000 |
| tree | 08e49f6092c7c205a2872464672b088744c75e28 | |
| parent | 8b0ac09f1af5d84b9b3e3a18737324ef042f3956 [diff] | |
| parent | de4b6f2ecc687744803cfadfc69cb83bca000392 [diff] |
am ac847e90: (-s ours) am 698da3ce: (-s ours) Import translations. DO NOT MERGE * commit 'ac847e90528eca8283617c0fa801b12c9f26d148': Import translations. DO NOT MERGE