OSDN Git Service

Merge "Don't complain if a VPN changes capabilities." into pi-dev am: 0a93a3530d
authorLorenzo Colitti <lorenzo@google.com>
Thu, 31 May 2018 18:46:43 +0000 (11:46 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 May 2018 18:46:43 +0000 (11:46 -0700)
am: fc9df9896c

Change-Id: I139f1355776bae6248c6e85ac98b6b585f7e123b


Trivial merge