| commit | 177b9afcb1ee619f51f0e86e45ea2b6689039b6e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Sat May 04 01:25:10 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 04 01:25:10 2024 +0000 |
| tree | 183480419fc5f0c2ed783234a096770cc1617ed2 | |
| parent | e38392fc8ca655efa9160e67da999cad20d91f83 [diff] | |
| parent | 2880a0937b7771fad3336f835992093d0c1d7b59 [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: e3750aa0c6 -s ours am: 891f9c5a9d -s ours am: 2880a0937b -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26999151 Change-Id: Ic1242f10b915cdbf50955b4efee6ea964cfdeca1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>