Skip to content
Commit 921f98c7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into... 

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 051a24c5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I32f8fdc2a6b9e1e23bca027ad7707b367e2e4cf5
parents 7eabaf09 051a24c5
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