| commit | 289974b1951cb8206b44ea6274755350423d197c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 18 22:25:15 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 18 22:25:15 2021 +0000 |
| tree | 5c1223765fd121cab41b244c991cbe4f922dafb8 | |
| parent | 839cec5d2e1e1c9ff1a6381aa03bc3d270e89f4d [diff] | |
| parent | 085d433a74a96e498f8581c2c1108a3f5d112d36 [diff] |
[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 8fb8921a5d -s ours am: 085d433a74 -s ours am skip reason: Merged-In I13199bc39e9445929195f3d15579cbffe94e92b0 with SHA-1 0f473ac71a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16280702 Change-Id: Ifaa4f4cfd0ea0bfcc5e41398bb453c2f293a1bfc