| commit | 483d4ba638ce466d6da525dc7e26e0d9a8754379 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat May 30 21:52:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat May 30 21:52:05 2015 +0000 |
| tree | 96d0001c90275855086fd1c525f23df44e56c7a5 | |
| parent | 22d50c34c70c2e8f770989ef5b24cbd9ad2d8366 [diff] | |
| parent | fad26c23343372d92c0324f27b2c45a8ad845ed8 [diff] |
am fad26c23: (-s ours) am 9e144027: (-s ours) Import translations. DO NOT MERGE * commit 'fad26c23343372d92c0324f27b2c45a8ad845ed8': Import translations. DO NOT MERGE