tree d4a54a21ff60f22fb69d82b0252a32b89b523934
parent 6bdd424cc3353e1b74df48832b76c8982502f6d0
parent 1fac3d0848254ff58d4f0f7c68f5cab45d886395
author Bill Yi <byi@google.com> 1486110973 +0000
committer android-build-merger <android-build-merger@google.com> 1486110973 +0000

Import translations. DO NOT MERGE
am: 1fac3d0848  -s ours

Change-Id: I61e7c0a508547dc4cc66bc35058720c43e14049d