| commit | 880c8bff3aadf0e4ae97103e44d90c9986adabcb | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 14:31:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 14:31:01 2015 +0000 |
| tree | 222bffc5fe743dd6be190d29bc55f900c21ee615 | |
| parent | ff683f9fe09ce6e8df93e27e6923ddcb135473ac [diff] | |
| parent | 5042a102bb4672a0c14d8d4b6a4c83eff14f7649 [diff] |
am 5042a102: (-s ours) am 161c7011: (-s ours) Import translations. DO NOT MERGE * commit '5042a102bb4672a0c14d8d4b6a4c83eff14f7649': Import translations. DO NOT MERGE