| commit | e3750aa0c60c2068a4fe135540368801356ecb31 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Sat May 04 00:25:11 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 04 00:25:11 2024 +0000 |
| tree | ca6a2a16cd2f4d1c4574aa3a1ee926afa352e664 | |
| parent | b2bb5e86a9ef1274fa3b1c0c50a31cdcdbefb2dd [diff] | |
| parent | b5bd26e07adc826c598220208094573a127bd3ad [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: b5bd26e07a -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26999151 Change-Id: I1ed51382120cff9a4cd76c9eff66474f32ebacb1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>