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