Skip to content
Commit 97714cd3 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: 21952d24 -s ours am: 0d6d7a74 -s ours am: c8581eab -s ours

am skip reason: subject contains skip directive

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

Change-Id: I38a2ea7afa4c7304e774ee09ad0838c406efd919
parents ae9e6f1a c8581eab
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