| commit | 77518fccfe60cdcb458f652b4e1b27c9568b8710 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri May 03 21:09:32 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 03 21:09:32 2024 +0000 |
| tree | ba9bf4abc4425d6535c5a171b78ccac78748bbdc | |
| parent | 636242b0f10ae24b2f15512ca88f5c9b352b0060 [diff] | |
| parent | efc4e63042f4c3af7528e3342666b105115301d1 [diff] |
[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix setSkipPrompt on Android S" into sc-qpr1-dev am: dfaf0f7736 -s ours am: b147128bc1 -s ours am: 06bbc575a6 -s ours am: 2f4d04b7c7 -s ours am: 140d966629 -s ours am: 40c73fc591 -s ours am: efc4e63042 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27002363 Change-Id: I4397e1a3ac71d1a4c6d016d5bfc460ce2a4bffab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>