| commit | dcca6f6f56aa2c1cd9125c64ba9a1c07bb35728d | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Tue Mar 23 14:03:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 23 14:03:13 2021 +0000 |
| tree | efea1062ba92b9ccc54d16a62a4e78ee1f901108 | |
| parent | 52396dad7e1fad3bdba86a1dd6aefc7d6aba1347 [diff] | |
| parent | b9be227c4615b4cd42bb9668b079d53c448a64c3 [diff] |
[automerger skipped] Merge "[VCN15] expose addUnwantedCapability and related APIs" am: f38268cd56 am: b894e12344 am: b9be227c46 -s ours am skip reason: skip tag Change-Id I3f2e6a99e015f09cc4405f6804eac4ae33e3dcc7 with SHA-1 7ff635a9a9 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639654 Change-Id: Id34011ffbdd997f29140b12cae5a0caeae745d3e