| commit | 6e3a221229144f7230516f12e4afb8010204e552 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Apr 12 18:47:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 12 18:47:58 2021 +0000 |
| tree | e1e860dd9301ee20ba44f3f7cb35d8fdefa1f3f0 | |
| parent | 604cb1a6875e6e34ce52251bba113c9c447322af [diff] | |
| parent | b778e99951529713c8452102f9fdb9e88e272949 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a700a70372 -s ours am: b778e99951 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14158295 Change-Id: I324a85b03087f0d7cfa9abe6ef145b20bad2c133