| commit | 233f1b61ce627819adb4351eb0b2d78f3020a38d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Aug 07 04:48:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 07 04:48:08 2015 +0000 |
| tree | c2fb5834def58ea7f335d0fd41f152c04a6556bc | |
| parent | 13d387631f586d03a77aace9da9a991d5aea32ba [diff] | |
| parent | 6540a97291a5217558e67e5ed4186a25fbd16145 [diff] |
am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE * commit '6540a97291a5217558e67e5ed4186a25fbd16145': Import translations. DO NOT MERGE