tree f4f6b320ea2659fa57ff3bba53c67f5bac9f71f5
parent 4422e50d8f49bc782f6e10c769c702bc06c8670a
parent 5a98f2fd658844592748af154d16ff2e6fbb84a7
author Bill Yi <byi@google.com> 1561527396 -0700
committer android-build-merger <android-build-merger@google.com> 1561527396 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 0517d3d5e5 -s ours
am: 5a98f2fd65 -s ours
am skip reason: subject contains skip directive

Change-Id: I57a2452174078b149c8f4e8c6c98ab551283f3f7