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