commit | b4c0ad97750b2b6be08db5afe073b6ad726d9892 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 12 17:13:36 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 17:13:36 2015 +0000 |
tree | 84664f13e9dcc2ee83244da3a181a6ea49e2e925 | |
parent | de5fe60afbd1cfb9e8e0012e00911c5d859ee414 [diff] | |
parent | 94127464b460b65ca6689e1c5156789decca8488 [diff] |
am 94127464: (-s ours) am 99ec3595: (-s ours) am ef2f6596: (-s ours) am ac3b53a7: (-s ours) Import translations. DO NOT MERGE * commit '94127464b460b65ca6689e1c5156789decca8488': Import translations. DO NOT MERGE