tree 956408698f120e4ed4d68699223072293f8e1da9
parent 6dd26947ad2899d94b306dbd7b1cd48981d10d87
parent 51f4d8a11da898b2caef9966571453e37dead823
author Pavel Maltsev <pavelm@google.com> 1522214897 +0000
committer android-build-merger <android-build-merger@google.com> 1522214897 +0000

Merge "Merge "Minor clean-up in NetworkCapabilities" am: 1dd43b192c am: 6ab3c9c246 am: 5d97ad9fe4" into pi-dev
am: 601861fd1c

Change-Id: I6605aad319ea268827f47d95fb6aef7c4c07ae93