| commit | b69a08bb09a96c900af1b45068c57c6289dab046 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Sat May 04 00:46:32 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 04 00:46:32 2024 +0000 |
| tree | 6a9c08d06f7afa9934ad97c28c359e8974448c6c | |
| parent | 57201e10a68e46cdc8969aae027a391ea3dc945d [diff] | |
| parent | 2f7bcd64e8d7ed5cf82ffd1a3350f98eeaf08dcf [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: 2f7bcd64e8 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26999151 Change-Id: Iace9ea3814354249a23f13ff2ba7f9a6e93ca896 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>