Skip to content
Commit 1438e6df 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: 5cadaf83 -s ours 

am skip reason: subject contains skip directive

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

Change-Id: I26c9c3de0b71283380fc40d0f831dcffe48cccc6
parents 0d6d7a74 5cadaf83
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