| commit | 433211c37032cc36298ad125959729d82364e715 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Sat May 04 00:46:41 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 04 00:46:41 2024 +0000 |
| tree | 7edc284cc2d0615b632184599dc6db96f80132e6 | |
| parent | d460dbd13b5cb6eb92da8f134100cb835c5f9bc8 [diff] | |
| parent | 2f7bcd64e8d7ed5cf82ffd1a3350f98eeaf08dcf [diff] |
[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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26999151 Change-Id: I731bbea4ba8b2919912c440ab124c03c769e3512 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>