| commit | 57201e10a68e46cdc8969aae027a391ea3dc945d | [log] [tgz] |
|---|---|---|
| author | Guojing Yuan <guojing@google.com> | Sat May 04 00:46:11 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 04 00:46:11 2024 +0000 |
| tree | 6a9c08d06f7afa9934ad97c28c359e8974448c6c | |
| parent | 1068716be9962efa6ef2b7ed24f4e3dfe0ac62a7 [diff] | |
| parent | 3ed4830731f67768a8d18c87ff0b3462c8ff841d [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: 3ed4830731 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26999151 Change-Id: I78ab501a4bc12cf7444dc8e065e674fe94bc122a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>