Skip to content
Commit b4ffd38e 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: 7852f2af -s ours 

am skip reason: subject contains skip directive

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

Change-Id: Idfc126c48f20b75ba1601054810a35eca8f5e98f
parents 167d95be 7852f2af
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