| commit | 4e18fb99c8db3ef6b68df18dbcec6c5313c82470 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:48:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:48:19 2015 +0000 |
| tree | dbee8472d8fa974dbd74a2557ae47da1a28c3832 | |
| parent | acab024e60a3fe95931b2dfc44c114d31870c336 [diff] | |
| parent | 98ec64cc8c123e135d486134de5a61257ab0a647 [diff] |
am 98ec64cc: (-s ours) am b778fdff: (-s ours) am 624275b5: (-s ours) Import translations. DO NOT MERGE * commit '98ec64cc8c123e135d486134de5a61257ab0a647': Import translations. DO NOT MERGE