tree d5d4c93709f2098479f2c568a82fd823607bf53a
parent fb46471c3c67e2866c223810dab62f8a56191e5e
parent 11e90e686535d642dd663d887202d68c7f7a0d16
author Bill Yi <byi@google.com> 1520031241 +0000
committer android-build-merger <android-build-merger@google.com> 1520031241 +0000

[automerger skipped] Import translations. DO NOT MERGE skipped: 8c8bc9be80 skipped: 2edfa5fe9e am: 2ff848a964  -s ours
am: 11e90e6865  -s ours

Change-Id: I9b97046bdf65fea14a9345dbd06bd76c3094060d