Skip to content
Commit 69fefeff 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: 8500c90d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3f77259fb8f6b746e06441c9ddd075a3f8b745fc
parents 0c4f8f2f 8500c90d
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