| commit | 5848da6109446e9cc6534df8e955aec8eb85b7d4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:41:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:41:28 2015 +0000 |
| tree | 9a4a6b063bc0b6a651002094990f1169be4e89e2 | |
| parent | 309473fc0f53c2087bc80735180911988a7d97ab [diff] | |
| parent | 714dc4e6564df4fb0b2712c2609046c9d61035f3 [diff] |
am 714dc4e6: (-s ours) am 28b49694: (-s ours) am e3da3502: (-s ours) Import translations. DO NOT MERGE * commit '714dc4e6564df4fb0b2712c2609046c9d61035f3': Import translations. DO NOT MERGE