| commit | 291a8de41c90bdab795199669f0fa12adf5854c9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:11:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:11:30 2015 +0000 |
| tree | 2a8e16b5cea28e0c4830d9b5feff6a321913a161 | |
| parent | 6f6fc9b4c218169fdc88c56ac86a0a20d66e239b [diff] | |
| parent | 5b36696e4280db82808a190dcd22cc1789ab991a [diff] |
am 5b36696e: (-s ours) am 0b568691: (-s ours) am ae1c4b2c: (-s ours) Import translations. DO NOT MERGE * commit '5b36696e4280db82808a190dcd22cc1789ab991a': Import translations. DO NOT MERGE