tree 0be15f0f2bb113ab86ce293b3dfd4cf01ce9b29a
parent 59a2e5d34c52941b7cd0eac59308af4217859e3a
parent 0f70b8c4f74e903c0bf359913e3ec215894da2c4
author Bill Yi <byi@google.com> 1550680535 -0800
committer android-build-merger <android-build-merger@google.com> 1550680535 -0800

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: e937b2703e -s ours
am: 0f70b8c4f7 -s ours
am skip reason: subject contains skip directive

Change-Id: I2d29e0bd50a1cade1644abb8f736af7210e13307