| commit | 7dfef17f5d9733a6b661bf02ad43bb32c6514e48 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri May 03 21:09:10 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 03 21:09:10 2024 +0000 |
| tree | ba9bf4abc4425d6535c5a171b78ccac78748bbdc | |
| parent | b38e6af172644ce1fe70997acabebaba3339937e [diff] | |
| parent | 1fb35d1da0f267d23b1cc0f5065467959682ebfa [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: e57e32c079 -s ours am: 8010083023 -s ours am: 1fb35d1da0 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27002363 Change-Id: Id3bcae2fbeb7a94a10bb720a16e6457d71a3259d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>