commit | 04b83e4604eefea69346c1b06b5288e294eb9250 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Apr 22 12:53:43 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 22 12:53:43 2015 +0000 |
tree | c82d17e5ca4de615e1882c7b0bbe16767d690584 | |
parent | fab51685917c5bfc08cf3c081b2e0a7e3731b18d [diff] | |
parent | 072c2ed4f977b6142e31b263d1a3097e40690e35 [diff] |
am 072c2ed4: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '072c2ed4f977b6142e31b263d1a3097e40690e35': Import translations. DO NOT MERGE