tree a67ed5cc6dc6388ac8f21a938ad04178657795d5
parent 18ffea713046bef8938ad741666d9f5a6d165cc6
parent 5e6b525f32a2bcb1ccfae238a527786134820b1e
author Erik Kline <ek@google.com> 1517039591 +0000
committer android-build-merger <android-build-merger@google.com> 1517039591 +0000

Merge "Add Tethering's UID to the legacy type NetworkCapabilities" am: 2aed62d664 am: d98c6b91a5
am: 5e6b525f32

Change-Id: Icff5c0ca59fc04377bd6beeff09e65b0d2170f17