| commit | e8c5cbfd5ba87b7fd7a005d37f63ca468af6d1c4 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Fri Jan 07 17:48:50 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 07 17:48:50 2022 +0000 |
| tree | 170e183eb379151fc749a3c8f023b1d2ca6da60d | |
| parent | cf8f54b9e3a19962ba0dfecb1608fd014e6cde87 [diff] | |
| parent | aa301c6fc84611387264adc275c306add349856d [diff] |
[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: aa301c6fc8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1940733 Change-Id: I68d1975f5538f2a6aeb5dcc64a09d1f230af9aea