Skip to content
Commit 1ad5c2f3 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: e4f60f7d -s ours 

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75e75da0e0cb01337f3ccc70829838cae43a46e2
parents da33eadd e4f60f7d
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