Skip to content
Commit 8500c90d 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: b7dc9795 -s ours am: fba69cad -s ours am: e8b43ffe -s ours

am skip reason: subject contains skip directive

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

Change-Id: I79e5efb3a72153fdf1cf7ae5e6ab84e3e10bec3f
parents 48225d08 e8b43ffe
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