tree 2394f9f5f16ea909ce688727f6ec2f81b6591c05
parent d502a1469685d97c2ec09385934de3dc1acd23e8
parent 6ad70eaa60c8f4d4143078d29773d39ac9b03f74
author Bill Yi <byi@google.com> 1467049702 +0000
committer android-build-merger <android-build-merger@google.com> 1467049702 +0000

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 6ad70eaa60  -s ours

Change-Id: I364d21030fb62f1355e91d67459d418d69af5660