tree 5ccf84a249bc0f8cf5d9e424aeae4f8f23ba59a9
parent d620aa5fd069e568d0d5d16e2eed172b21d73e8d
parent 407d517cb82a531e8a798386c8230d0d04f3de23
author Bill Yi <byi@google.com> 1526607446 -0700
committer android-build-merger <android-build-merger@google.com> 1526607446 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688 am: 1c6bdf5174  -s ours am: a1df530ac7  -s ours
am: 407d517cb8  -s ours

Change-Id: If2961de1aeb6216c482b84b9fd00657c8d3e47bb