tree 6528f7271927c26aa1fd7ee46f53dca0448295f0
parent 54e53afffce0ba055d240fff2b93378582e691e9
parent 2ac687754ef3c7abc5a4f1e029e32c3c06030db2
author Guojing Yuan <guojing@google.com> 1714767311 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714767311 +0000

[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: 3ed3e573a4 -s ours am: 6991a35cd7 -s ours am: 2ac687754e -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27002363

Change-Id: If0a451f5cd2252f1a98c4fe21c6cc0002af99870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>