tree 5c6be628e1223ce7d1ecf4b90dd83efb9386022c
parent 63022f4c744722764d40c803e9e2137fdfcde300
parent 8416e044dd503d319f65a1ecc1d731b400c52745
author Bill Yi <byi@google.com> 1466073376 +0000
committer android-build-merger <android-build-merger@google.com> 1466073376 +0000

Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: d58da1be76  -s ours am: cf0bd1675c  -s ours\" into nyc-mr1-dev-plus-aosp
am: 8416e044dd  -s ours

Change-Id: I4f47eb45618d71fa87bee827a098847bd2742c99