commit | 35872116acd54375809f7d2eea76f1ba4720646d | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:25:23 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:25:23 2015 +0000 |
tree | 6914d97ff20a9048a0a2d3e7cf29120aa1b0f7a8 | |
parent | 1bbbb941ed819ba14f8c1fa7756843e5a9cc2e32 [diff] | |
parent | 273303e7c0a0d1fe0493ed327070aeb8fb80c808 [diff] |
am 273303e7: (-s ours) Import translations. DO NOT MERGE * commit '273303e7c0a0d1fe0493ed327070aeb8fb80c808': Import translations. DO NOT MERGE