Skip to content
Commit 069590ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2c556eee -s ours 

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7141e607f2cbdfa89cc8c0bd2140f2e3d9deb47e
parents f4930cfd 2c556eee
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment