tree ebdf8b909a71c90f4f3580ffca550ab3dfc2b2c3
parent d475b3a66330dd4d639b4f5249169f966c739dbf
parent 3b3037676922eac871bb5c01d7a42ded49bdd0e6
author Bill Yi <byi@google.com> 1517074600 +0000
committer android-build-merger <android-build-merger@google.com> 1517074600 +0000

Import translations. DO NOT MERGE am: 5f93061208  -s ours
am: 3b30376769  -s ours

Change-Id: I6ca786e1cee09e695492eb1d2586dbf7f6ceb86e