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