tree 0822e6b99f34d879064a22f02bf473a9d413f447
parent efe92fbb4a644b30ae79b2fc6a4aef89f7140f91
parent ef6bbeb34971fe1e0cd1c18f707f1f5abf0b6011
author Bill Yi <byi@google.com> 1558195165 -0700
committer android-build-merger <android-build-merger@google.com> 1558195165 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 7a762b564f -s ours am: 82d7d3d88b -s ours am: 025413cd6c -s ours
am: ef6bbeb349 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie67812c9c0c9347cc209fa6d68d8d38a3c3964c6