| commit | 140d9666294d83c842a77e5f49e3646eb4deecbe | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri May 03 20:32:26 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 03 20:32:26 2024 +0000 |
| tree | ced24d5722cde81d8a83c5884dcba24d23237f1b | |
| parent | 172969b90bd11b75fe5cb0e356bc457677741d34 [diff] | |
| parent | 2f4d04b7c794ce1a79a9b44994d7bf9efbb0ed2b [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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27002363 Change-Id: Ia1eb5332dbc3fc9bd64e61d2ddccd52b9577526c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>