commit | 3123a733d3296969127b7d2f1927d365fdaec930 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri May 03 23:23:59 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 03 23:23:59 2024 +0000 |
tree | 64f6440ca63a0e5a8e0b4901b11c1cff3bd1d17a | |
parent | e7cfb41e5fa26dadaec09743fa7356f0674899fe [diff] | |
parent | 1b7c92b6aa04d92f5f1bc29e3973797c4c619501 [diff] |
[automerger skipped] Merge "[DO NOT MERGE][CDM] Fix setSkipPrompt on Android S" into sc-dev am: 69f3dbce27 am: 1b7c92b6aa -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26999151 Change-Id: Ie600101976ad9b2edf737538734093b47ea7773d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>