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