tree 47d0ec409ddecd013305b0959d1e6aaca298c816
parent c51c2171bbd4cf5423b4ade4411bcaf95e8469d9
parent eb9d1a8d9d5688e2d0022d64b172ca47d3538352
author Benedict Wong <benedictwong@google.com> 1613587973 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613587973 +0000

Merge "Expose Basic VCN API surface" am: 54e89ebf18 am: eb9d1a8d9d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554519

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie07ac92ba45166f2115661bc19f52c48e7815911