| commit | 271929761551a0b515194bcdb6364d1b12522b88 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Nov 25 17:49:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 17:49:14 2014 +0000 |
| tree | dd8f7c195ddee7cc64d0ef9debd04dfebd00e719 | |
| parent | c02f304c3a1dc45a7e44b9f91b38c62353850d30 [diff] | |
| parent | db3b7b5846d3a047d5a049fd1f931b8a87b46b68 [diff] |
am db3b7b58: (-s ours) am 597226d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'db3b7b5846d3a047d5a049fd1f931b8a87b46b68': Import translations. DO NOT MERGE