commit | 3ed4830731f67768a8d18c87ff0b3462c8ff841d | [log] [tgz] |
---|---|---|
author | Guojing Yuan <guojing@google.com> | Sat May 04 00:39:37 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 04 00:39:37 2024 +0000 |
tree | ca6a2a16cd2f4d1c4574aa3a1ee926afa352e664 | |
parent | 4fbc8a29e83976c2e8214622173bda743d17b523 [diff] | |
parent | d0579c26948344c4826c9c04a125ff4b1ac94c5d [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: 743d3c3277 -s ours am: d0579c2694 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26999151 Change-Id: Icc735e30c6a33d467971874ee1bed7a1b91c358b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>