| commit | 67c8cb29fd78cd2740ef4c7f3d3d5c411b89265d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 19:30:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 19:30:54 2015 +0000 |
| tree | 252658e6cf11d85ff76b8e36f954b0052b9f54cf | |
| parent | eab75dc75079c67ab9bbba33e1625bd6aa8edd3d [diff] | |
| parent | 05dca0354e4183cf381c8f36c5ef455ddec65b76 [diff] |
am 05dca035: (-s ours) am 752b2e03: (-s ours) Import translations. DO NOT MERGE * commit '05dca0354e4183cf381c8f36c5ef455ddec65b76': Import translations. DO NOT MERGE