tree 0017aada0d16ffd3e855fe5505f3095a686aa1b9
parent f953d8673ddb75f19b451bffa5b674f55a733ece
parent 807f0cc86265d3e6bbb9e17348ae6b8364fed004
author Bill Yi <byi@google.com> 1522338143 +0000
committer android-build-merger <android-build-merger@google.com> 1522338143 +0000

[automerger skipped] Import translations. DO NOT MERGE am: 08cbfd6c12  -s ours
am: 807f0cc862  -s ours

Change-Id: Id90e33b4cff66767241724f8c3396b0776317412