commit | 078528167660bd3430bdb29d52c3a49792d1de15 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Mar 04 14:00:38 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 14:00:38 2015 +0000 |
tree | e818f0ed320c0ce785a31bfe93e61fe0bf3f0394 | |
parent | 429052d5836f36ee2b5385a168d07d67937e92d5 [diff] | |
parent | a6315bde9d4d696a1b23aa1d5be1511ec9a21aed [diff] |
am a6315bde: (-s ours) am a07520f6: (-s ours) am ba5c9ed1: (-s ours) Import translations. DO NOT MERGE * commit 'a6315bde9d4d696a1b23aa1d5be1511ec9a21aed': Import translations. DO NOT MERGE