| commit | da696a5afc2fb69b26265a8af85cabf73497d84d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Mar 17 19:14:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 17 19:14:56 2014 +0000 |
| tree | 2be1839253611575e696cae5ead9096dc29db6cc | |
| parent | 82fe2bd10ff502abc91efd95cd4e16df33378785 [diff] | |
| parent | 173ddb360c02a0c69cac39f54de1af5b3ddc95fb [diff] |
am 123c62a0: (-s ours) am 58e89bee: (-s ours) Import translations. DO NOT MERGE * commit '123c62a07e7d0ba07ffe0f61f0abc3e1878cc6c7': Import translations. DO NOT MERGE