Skip to content
Commit 5bb0f603 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: 210dc47d -s ours" into stage-aosp-master am: da7ac9e5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3a675537840566aea1bfe04d804219627521ee9b
parents 8caaa711 da7ac9e5
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