commit | b2bb5e86a9ef1274fa3b1c0c50a31cdcdbefb2dd | [log] [tgz] |
---|---|---|
author | Guojing Yuan <guojing@google.com> | Sat May 04 00:24:38 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 04 00:24:38 2024 +0000 |
tree | ca6a2a16cd2f4d1c4574aa3a1ee926afa352e664 | |
parent | a8a14f4ba268eecf13fa77c5192bdac7c21e3bb8 [diff] | |
parent | 32e01ced7af888662d8370166e98588861d36d5b [diff] |
[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: 56ac420b65 am: 78ec2034d1 -s ours am: e7cfb41e5f -s ours am: ed32b8747d -s ours am: 32e01ced7a -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26999151 Change-Id: Id4922c48a0f68342c0a42c43cf0b711e21050428 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>