| commit | ed43c9e5bdf2b544102aeebc38686e5fce849259 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Wed May 19 12:03:01 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 19 12:03:01 2021 +0000 |
| tree | 6ec84bf6ac75f6865c5a5765f31998b02fbe852a | |
| parent | 868f670bdeeb159ccd071df08f6aae4c74aa7354 [diff] | |
| parent | 0dc5e2a8a2bba0f5fe6cbb3ef6a477c5edbeb57d [diff] |
[automerger skipped] Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev am: 0dc5e2a8a2 -s ours am skip reason: Merged-In I98dd3f4652dc067eb5c4666e952db6c854bcbb10 with SHA-1 9ef2350d50 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550548 Change-Id: I4bd31102915e420296d0e3566c07239cab2e0c3b