commit | 184b055e62fa75ce1bdc49ed32852c67f530066f | [log] [tgz] |
---|---|---|
author | Guojing Yuan <guojing@google.com> | Sat May 04 01:02:49 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 04 01:02:49 2024 +0000 |
tree | ba9bf4abc4425d6535c5a171b78ccac78748bbdc | |
parent | 4f642372e378fad788ff2b747ff0c2b571650b6e [diff] | |
parent | 57201e10a68e46cdc8969aae027a391ea3dc945d [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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26999151 Change-Id: I05103858c2f4fda2b93a45ad1d2400a87be770e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>