tree 0f3b7f9f1c910e4bfe5ad2f0173e0c096f5cb20e
parent 09f5a96a71d78a95169e1c9060068994695b2183
parent e5c99a2140bdbfb81f3b3c849909a61bc587e542
author Bill Yi <byi@google.com> 1487317220 +0000
committer android-build-merger <android-build-merger@google.com> 1487317220 +0000

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

Change-Id: Ifffdd23bc65534039a330bf77ceffaba418982ba