tree 1f45fb29de6b2e757e67a4dde724005a67f5f689
parent e82b4951280b53e252f9492d78ef19686c9ad304
parent 44f20dde53539f98c403ed2c2be0e0b09c9deb51
author Bill Yi <byi@google.com> 1522350117 +0000
committer android-build-merger <android-build-merger@google.com> 1522350117 +0000

[automerger skipped] Import translations. DO NOT MERGE
am: 44f20dde53  -s ours

Change-Id: I6835a39377b01eb784b880e6cd3abe54ad216a4c