Skip to content
Commit 75cec2db 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: e012e327 -s ours am: 5530f092 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I444bb656f440dcd20a5922cc5807faf577271da8
parents 028ad0a0 5530f092
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