tree 568ca9f5d60823c2497f941cc439c4dcdddf82d1
parent d71643b390f9c958f2d51b4dbb9d76110e46cda3
parent 0f5574a23d2a51e47b8ccc8466fd5caacb468765
author Bill Yi <byi@google.com> 1526825205 -0700
committer android-build-merger <android-build-merger@google.com> 1526825205 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 0f5574a23d  -s ours

Change-Id: Ic5a4d3eddb333e9f2238085fd07b2571c7ae5a57