commit | d461ca1876470bf2aebb76882460f660cbcb9269 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri May 03 18:36:45 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 03 18:36:45 2024 +0000 |
tree | 6a9c08d06f7afa9934ad97c28c359e8974448c6c | |
parent | af615bc000f41f793f8cf247ca0fb5e62ea0a959 [diff] | |
parent | cdba055adaae422be55749fdc8745d08233d720a [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 skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27001589 Change-Id: Id1db8d7ba8019cb0a8767594b683ddd00690202e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>