| commit | 34663b0fd4a21a6c107c6df313bcbd1548235fd5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 14:06:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 14:06:56 2015 +0000 |
| tree | c18f825b6785c86cf155b6ac5b60f9b96477fc79 | |
| parent | 62f7a266f8862fbec21a97c3a73e74871170296d [diff] | |
| parent | 36c35f23f17ecfc47d1e2ef5d36b6516251b9018 [diff] |
am 36c35f23: (-s ours) Import translations. DO NOT MERGE * commit '36c35f23f17ecfc47d1e2ef5d36b6516251b9018': Import translations. DO NOT MERGE