Skip to content
Commit 2fc4d1bb 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: fc2acf1d -s ours am: 5ac66184 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib87f0f0488fbad29a0561ce4827e4696d99de881
parents d6028c0c 5ac66184
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