commit | 2880a0937b7771fad3336f835992093d0c1d7b59 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Sat May 04 01:02:17 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 04 01:02:17 2024 +0000 |
tree | ba9bf4abc4425d6535c5a171b78ccac78748bbdc | |
parent | a63fb3cc81b4b27a1214120c65d4afbf059c0625 [diff] | |
parent | 891f9c5a9daa0328ad78c47ba13a0dcfac013424 [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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26999151 Change-Id: Id3e263aa526c9e03640a4b336b0d8536dd5bcaa6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>