| commit | 0694df9373fa1c4f7cc6e721dd24f6626667424b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:25 2015 +0000 |
| tree | 1e4c8e0dcb2f4c07cc6adc59701531549861f59e | |
| parent | 723e1ea5ddfe5d97414d17f3766e051765cda686 [diff] | |
| parent | 2b8c1bd6f4b4f4b937536b2528729b765083a041 [diff] |
am 2b8c1bd6: (-s ours) am 5d3947bc: (-s ours) Import translations. DO NOT MERGE * commit '2b8c1bd6f4b4f4b937536b2528729b765083a041': Import translations. DO NOT MERGE