commit | b71ada4f2ed59d1ab47dd121cb6a187b68eacd96 | [log] [tgz] |
---|---|---|
author | Guojing Yuan <guojing@google.com> | Sat May 04 01:26:12 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 04 01:26:12 2024 +0000 |
tree | 183480419fc5f0c2ed783234a096770cc1617ed2 | |
parent | a19cfbd7a60ec6fb04fcf9782f8f2ae3ce473195 [diff] | |
parent | 184b055e62fa75ce1bdc49ed32852c67f530066f [diff] |
[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: 56ac420b65 am: 78ec2034d1 -s ours am: e7cfb41e5f -s ours am: ed32b8747d -s ours am: 743d3c3277 -s ours am: d0579c2694 -s ours am: 3ed4830731 -s ours am: 57201e10a6 -s ours am: 184b055e62 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26999151 Change-Id: I6a51463a24a116b245b6cf82efd8ede35fd566dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>