Skip to content
Commit 6bd10151 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE"... 

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 979367bc -s ours am: ec80d611 -s ours" into sc-dev-plus-aosp am: b49d6b5e -s ours am: a0be3bce -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6f2c41656e3bc60ecc5361f8864a05e20c83ea70
parents c47dbf61 a0be3bce
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