tree 5ccf84a249bc0f8cf5d9e424aeae4f8f23ba59a9
parent 32e6e4174b099f7328951d55bbee3244af23cce4
parent 4ec0ca5336a657cd8e4d92c437ce8661a1eafbda
author Bill Yi <byi@google.com> 1526609400 -0700
committer android-build-merger <android-build-merger@google.com> 1526609400 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2 am: f028e75015  -s ours am: c22431c753  -s ours
am: 4ec0ca5336  -s ours

Change-Id: I6c275134419ff0a7e8e9d0fec9e7056492416913