commit | c7019958f6e599ebe6638915ca0a99cdd1bfd078 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri May 03 18:48:19 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 03 18:48:19 2024 +0000 |
tree | ba9bf4abc4425d6535c5a171b78ccac78748bbdc | |
parent | f4c9fe97b0cf9582c92505b688d9ef68870bfa5d [diff] | |
parent | d461ca1876470bf2aebb76882460f660cbcb9269 [diff] |
[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix setSkipPrompt on Android S" into sc-v2-dev am: 11a7319a8b -s ours am: 627dcbedac -s ours am: 79e2846b08 -s ours am: 698784d057 -s ours am: cdba055ada -s ours am: d461ca1876 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27001589 Change-Id: I5785bdf6ff747e081919dda67d7a145cb34aa3b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>