| commit | eae095bfc2bc05b253894395f1afa63a3cf17a36 | [log] [tgz] |
|---|---|---|
| author | Nate Myren <ntmyren@google.com> | Fri Dec 02 23:09:11 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 02 23:09:11 2022 +0000 |
| tree | 653da30f05a2b20ee0d6961a12b28dfca6f8b5c8 | |
| parent | 5c764321406493ca3dafe2174fb4c19bd328161c [diff] | |
| parent | 42cbd4cffab9faeac4b82f7f0190be1441eee108 [diff] |
Merge changes from topic "cherrypick-cherrypick-attrTokens-xdkc7c9ixz-3kymu67epe" into sc-qpr1-dev am: 0dd8a79068 am: 066b27ff56 am: 42cbd4cffa Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20521154 Change-Id: Iea3358a0cd50d45b25936dc119ce82423bfff561 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>