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