commit | 5fbae2e7b65d9827278468d893983573b36291bd | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jun 15 12:59:57 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 15 12:59:57 2015 +0000 |
tree | e6ace7934bea976f32519a290cd3f7a8abd8195b | |
parent | 86b4dc4d332a7acad95f691ca513d846da6e0f75 [diff] | |
parent | 640a0c95e6acca84b12c40a5f8444e31a9261360 [diff] |
am 640a0c95: (-s ours) Import translations. DO NOT MERGE * commit '640a0c95e6acca84b12c40a5f8444e31a9261360': Import translations. DO NOT MERGE