tree 7652ac3d66acf9b55fe6815121dd2219e2c8716a
parent c0ab918d545f0da7394d7c83bd34c89f8b462ae9
parent c110ac2338dd4ea61747f311a3c88cbcb2acb6d3
author TreeHugger Robot <treehugger-gerrit@google.com> 1607271347 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607271347 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c110ac2338 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13175748

Change-Id: I1f8d60bdc2eac29accbc1e93610a7ebb3c8bb254