Skip to content
Commit ff696632 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: ba3a4a36 -s ours 

am skip reason: subject contains skip directive

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

Change-Id: Ifdf9131467b08d2c6e2b26c43b9b6e2f4e6b019e
parents 1689cdd1 ba3a4a36
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