tree 8166d34eda4ed1f4024860adf8bb619d7aaf4cc0
parent 9cb8ced2b62b64b2e011cdc2285d26d97bb6caf6
parent f33d91e23ff2367abbbe5ae1fb70614181fa5706
author Bill Yi <byi@google.com> 1502037011 +0000
committer android-build-merger <android-build-merger@google.com> 1502037011 +0000

Import translations. DO NOT MERGE
am: f33d91e23f  -s ours

Change-Id: I31230ff804922c1d2c25aa253ee5bef7d198caac