Skip to content
Commit 04f783cd 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: e18dc3c3 -s ours am: 70c9ae22 -s ours" into rvc-dev-plus-aosp am: 2549c876 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia5b4f966b7aac4dcfc53b751e850b7001957e1ba
parents 936bf304 2549c876
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