tree 6d94f7072a097a8ed700480ede4be7fa8608e5a4
parent a037f9c626ccd36aeab3c38575a46bf8c743d6db
parent e8e0d9ca63a5484c855c6404f3780458848ff4bc
author Bill Yi <byi@google.com> 1533396261 -0700
committer android-build-merger <android-build-merger@google.com> 1533396261 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f98c32434b  -s ours am: 3c4b5b9719  -s ours
am: e8e0d9ca63  -s ours

Change-Id: Ia30b5b7275d614285207995b361dda4152cd02a0