tree 7a16220653284d82cb078cecfc4f36391dd80184
parent 031b3d756e490106f3690a421c6fc2f23430e135
parent f5cf275f149e6a257278b034a206c3e615ca062a
author Bill Yi <byi@google.com> 1494497656 +0000
committer android-build-merger <android-build-merger@google.com> 1494497656 +0000

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

Change-Id: Ia63223addf937e1ff8b1ecbbd955952846fba72c