commit | b38e6af172644ce1fe70997acabebaba3339937e | [log] [tgz] |
---|---|---|
author | Guojing Yuan <guojing@google.com> | Fri May 03 21:09:00 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 03 21:09:00 2024 +0000 |
tree | ba9bf4abc4425d6535c5a171b78ccac78748bbdc | |
parent | c7019958f6e599ebe6638915ca0a99cdd1bfd078 [diff] | |
parent | 73644fdd092e704aa8fe32ccae8df2d944582224 [diff] |
[automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: 3ed3e573a4 -s ours am: 6991a35cd7 -s ours am: 2ac687754e -s ours am: 3bc1d7ae9b -s ours am: f2147d4530 -s ours am: 73644fdd09 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27002363 Change-Id: I096a2e55c66e35487a569c456419f32772a9fd31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>