commit | 26c551aaa615a2af3ee8db240fc6f7d65c5532d6 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:43:08 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:43:08 2015 +0000 |
tree | 16bae1714534229680e62853d70a282d203819ac | |
parent | ca7d7e6b2afb2cec021078cca8672d1517697a62 [diff] | |
parent | 32771d6816b0bc5ef45ecc081eed654ecb96eecb [diff] |
am 32771d68: (-s ours) am 751b01e3: (-s ours) Import translations. DO NOT MERGE * commit '32771d6816b0bc5ef45ecc081eed654ecb96eecb': Import translations. DO NOT MERGE