commit | 7c363bb905e8296ebd10f9d289e527f19e36f930 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Thu May 31 10:41:34 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 31 10:41:34 2018 -0700 |
tree | 7965b7053af953f61034665fdf7162d7fbbd1bce | |
parent | 65ebcf2966340e203265c2d9827f76d3dcf5f6ad [diff] | |
parent | 8273ef4778818d8d74a127331471420ef94fe9c3 [diff] |
Merge "Don't complain if a VPN changes capabilities." into pi-dev am: 8273ef4778 Change-Id: I26d2e1526c21ad2bac369a565b06155780190692