commit | 645bce36004da5b3fa1df514bf58b356c99260f6 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:12:19 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:12:19 2015 +0000 |
tree | 19ab8bca32a31b13d1cd672de84982b6d85cb8d4 | |
parent | 725d7dae282d6cf06bfd9bdb1fe3fba1495e0310 [diff] | |
parent | a28465395bc661b750c7276e5028a17034e3edba [diff] |
am a2846539: (-s ours) am b1884ebe: (-s ours) am 3a61d0f3: (-s ours) am bb3a3312: (-s ours) Import translations. DO NOT MERGE * commit 'a28465395bc661b750c7276e5028a17034e3edba': Import translations. DO NOT MERGE