| commit | 75443c18c90684e0719f71499613f23c6181dbfd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:33:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:33:54 2015 +0000 |
| tree | a2ed6dd5d7636adf04e2a857153ae0ec0565c49f | |
| parent | d7f908cc51be2a1643f5d631be683f4437c5a828 [diff] | |
| parent | 2cbb2d13da04fb1da46f95f30ecccee5be2b568d [diff] |
am 2cbb2d13: (-s ours) am a7866cd9: (-s ours) Import translations. DO NOT MERGE * commit '2cbb2d13da04fb1da46f95f30ecccee5be2b568d': Import translations. DO NOT MERGE