tree 1775eb729fae239cc4fe0422a2b4fadde96b9add
parent e087edcab0bdf51dff295598d73236b76adb0ffd
parent 440d03ede2eef49a416726360f16072ab084d82f
author Bill Yi <byi@google.com> 1555157156 -0700
committer android-build-merger <android-build-merger@google.com> 1555157156 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 0b172415fd -s ours
am: 440d03ede2 -s ours
am skip reason: subject contains skip directive

Change-Id: I6c5b3c8702cf7471ad4800042cf63214682dd98b