tree 183480419fc5f0c2ed783234a096770cc1617ed2
parent b71ada4f2ed59d1ab47dd121cb6a187b68eacd96
parent af272475075a26dab2be4623931c8dfbb80b4c1a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1714785990 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714785990 +0000

[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix setSkipPrompt on Android S" into sc-dev am: 69f3dbce27 am: 1b7c92b6aa -s ours am: 3123a733d3 -s ours am: f07170dd1e -s ours am: 5dc34c403b -s ours am: f6dc36e36d -s ours am: 2f7bcd64e8 -s ours am: b69a08bb09 -s ours am: af27247507 -s ours

am skip reason: contains skip directive

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

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