diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-24 02:56:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-24 02:56:55 +0000 |
| commit | 8f6a4fcf208c2db3e816a05cd0b041f5778fd26f (patch) | |
| tree | d8517bed7ed32978217c49229c10f3ea797d78c2 /core/java/android | |
| parent | cf9a295882347b3d7142228191dac406776d1400 (diff) | |
| parent | ca7c9ee56f7d77512c0f96bbc5fddbfa836f708a (diff) | |
[automerger skipped] Merge "add CONTROL_APP_BLOCKING permission to car ks app." into sc-qpr1-dev am: 1a8db82016 am: ca7c9ee56f -s ours
am skip reason: Merged-In I6c6d860a4b884d8856ede3aa4c73c64a9c568dd5 with SHA-1 5ffbc2c1c5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900200
Change-Id: I53c0e4f26defb77c6cfd98583cdb6b03a3a4d42d
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions