| commit | 86b155f624ef438814fb719b945da3d2911347bd | [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 | 62493efe20e0ed3b9c3bd78e404ee62a251a4f15 | |
| parent | 2a4d6f6d43ce2b705650384357be8423054f1d05 [diff] | |
| parent | aec7499fca37c7a4b931049f5da0ff95c97638ea [diff] |
[automerger skipped] Merge "[VCN15] expose addUnwantedCapability and related APIs" am: 20d187254b am: 4a074bc753 am: aec7499fca -s ours am skip reason: skip tag Change-Id I3f2e6a99e015f09cc4405f6804eac4ae33e3dcc7 with SHA-1 ce8c92d956 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639654 Change-Id: Id34011ffbdd997f29140b12cae5a0caeae745d3e