Skip to content
Commit 7be4ab0f 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:... 

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da -s ours am: 66a625cf -s ours am: a94d9958 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I191ef5c7773eff3dbdadf2937476c3d6c0bb1995
parents 38c8324f a94d9958
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