commit | 85a12eaaa73d55991ba690edd4ace5a97f9d9520 | [log] [tgz] |
---|---|---|
author | Guojing Yuan <guojing@google.com> | Fri May 03 21:40:47 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 03 21:40:47 2024 +0000 |
tree | d9670db3c817903e8ff2aa146d29556c8f2a8e7c | |
parent | 2344ec91babd9e9538ace1f61db5f9c4e00753b3 [diff] | |
parent | 636242b0f10ae24b2f15512ca88f5c9b352b0060 [diff] |
[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: 3ed3e573a4 -s ours am: 6991a35cd7 -s ours am: 2ac687754e -s ours am: 6c572c245f -s ours am: 172969b90b -s ours am: bb1942bbab -s ours am: 026321b74f -s ours am: 636242b0f1 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27002363 Change-Id: I2c4b579904b269fe76a063e77def277cb39fb538 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>