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)
commitba7ce273c6f535127b8143015437cb30b3a16fa4
treed482af4e10fa4f1072aa08f7a7641f3805348cfe
parent14e1c54fa3f38c79cc080670519e15842e248a88
parentfc9df9896c738c932111731f37f07900b1b77c04
Merge "Don't complain if a VPN changes capabilities." into pi-dev am: 0a93a3530d
am: fc9df9896c

Change-Id: I139f1355776bae6248c6e85ac98b6b585f7e123b