commit | ad393387ed147a35a8dd9c5443cc895a1029dd6d | [log] [tgz] |
---|---|---|
author | Guojing Yuan <guojing@google.com> | Fri May 03 17:38:19 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 03 17:38:19 2024 +0000 |
tree | 93b90c519bc1adabfb2d89b483bf5073aef8a56c | |
parent | d50d4714c785c14d6486aa3283a8e3eccaab388b [diff] | |
parent | be2e3b05858ba7a6349f5487d2658d00853b11cd [diff] |
[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: be2e3b0585 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27001589 Change-Id: I2ae31638bed3786f13a6755fe4b4b811434f7a83 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>