| commit | 2f7bcd64e8d7ed5cf82ffd1a3350f98eeaf08dcf | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Sat May 04 00:40:01 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 04 00:40:01 2024 +0000 |
| tree | ca6a2a16cd2f4d1c4574aa3a1ee926afa352e664 | |
| parent | 3ed4830731f67768a8d18c87ff0b3462c8ff841d [diff] | |
| parent | f6dc36e36d1fa1a6863c5c22b3228a0bdc3be646 [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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26999151 Change-Id: Ic31be5cb869a63f1358ddca54356b8e6c1d7d71c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>