| commit | cd0800aad757f062247549ed3840feec804bcefb | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 16 05:23:44 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 16 05:23:44 2023 +0000 |
| tree | f59749aebf4eeec3f8d8e80488e9e9dfe0966ed7 | |
| parent | 4fc879e611f1d35711adfba560dbd039033227e0 [diff] | |
| parent | a83e1d4547dee9d2bcc4c0848898dd2728ad79e1 [diff] |
Merge "Merge "Ignore the reboot to normal intent when DSU is locked" am: 4811f1daee am: 7a99de2a88" into tm-qpr-dev-plus-aosp am: 21e9a30219 am: 1682c22ea9 am: b5775facb3 am: a83e1d4547 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2588547 Change-Id: Iec17bc623c88fefead45baf1e51440d941995883 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>