commit | 63ac00f229995c21605709e6ae9c4236658248fe | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Aug 21 04:18:29 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 21 04:18:29 2021 +0000 |
tree | 3ffae970361bbfb51cb76b2657c57ea0238814db | |
parent | 6a9c1fc9f9bbcae6b917d13f68ec4cab6ec76346 [diff] | |
parent | ca6f154c901ed04e2de777b56d4aaa7375b2481d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a58f6be753 -s ours am: ca6f154c90 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15643963 Change-Id: I37482f22472af6de9cd233a5c2ef76876ec0886f