summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2021-08-13 23:24:16 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-13 23:24:16 +0000
commit05a3ee414f4ff42da729d38e77f8abe04bf92fac (patch)
treef06baf1b78cc9e4bf896c8a479f7c15d15de006d /core/java/android
parent41d0e54a5e1cbd8b4366a7d5b207d0d4e5c5bc78 (diff)
parente71c41a8828b7455534db2cb2d615bd177b6f27e (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e71c41a882 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15544165 Change-Id: If1f42dec69d1d858d9dc1370e3b1342039092741
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions