commit | b147128bc1180f98ebf283d67e689f112fb0f83d | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri May 03 19:38:41 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 03 19:38:41 2024 +0000 |
tree | 64f6440ca63a0e5a8e0b4901b11c1cff3bd1d17a | |
parent | 6991a35cd77f5a88f3001300195299c31ad34c79 [diff] | |
parent | dfaf0f7736ef3945ca9d8b0e56a9e3ed6a186ff5 [diff] |
[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix setSkipPrompt on Android S" into sc-qpr1-dev am: dfaf0f7736 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27002363 Change-Id: Ie16a9ecc95b4de309ee37791226ef839ee581cab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>