| commit | a859b50771df9df68872c4e1a1ec721d8210cde3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 26 14:29:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 26 14:29:37 2015 +0000 |
| tree | 34196f8cfb461189a17f2195caeacec7187b41ce | |
| parent | 2f1964a9330ee9d25d0bf90e01dc34a1ceaf2ce4 [diff] | |
| parent | ca922bb455f2351bc3e31bf0b4d8da2c9a58afe6 [diff] |
am ca922bb4: (-s ours) am d57adbbc: (-s ours) Import translations. DO NOT MERGE * commit 'ca922bb455f2351bc3e31bf0b4d8da2c9a58afe6': Import translations. DO NOT MERGE