| commit | d2f65cf16400d4a95a99e4c382f67d940cf53bd7 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Wed Mar 24 00:00:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 24 00:00:29 2021 +0000 |
| tree | 19b57b0ad214640521705835c0ec94509e284b04 | |
| parent | deac61a3cf9eb360799827711325235a504ae0d6 [diff] | |
| parent | 41adde9ab3726353c8a06b0aeda1db40bbf31e45 [diff] |
[automerger skipped] Merge "Add resource to disable cb" am: d7858116ca am: 52c4c695a8 am: 41adde9ab3 -s ours am skip reason: skip tag Change-Id I060836c10b60638e4155670e16cf6475e6740665 with SHA-1 cc081579a6 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650607 Change-Id: I897da52763703393d909c87aba792acc2907e5cc