tree 34dd28c5d5f57ba20bcc1cf8c538b966664d9fd1
parent fddcb8242da83efc88b8da85e45a29dfb8ff9bc4
parent 656010e4c2f3f02d192df186b982b1253b26be93
author Bill Yi <byi@google.com> 1465838426 +0000
committer android-build-merger <android-build-merger@google.com> 1465838426 +0000

Merge \"Import translations. DO NOT MERGE am: 07edcb65d1  -s ours am: 3a28377c51  -s ours\" into nyc-mr1-dev-plus-aosp
am: 656010e4c2  -s ours

Change-Id: I56ebb45c30e7d8e866fe91125ceab481a71ac7ee