Skip to content
Commit c2605fa5 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: 13eeaecc -s ours am: c11efe23 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I15a8a69e3b0394ec18cafcd1c21666d12aa0a535
parents b6bec330 c11efe23
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