tree d07e1c7aafdbb0ecc07ae56b288a3f64a05e92e2
parent 9434b7cde4239e6583beb5dfebd008b35ce80e24
parent c9ac672d85bd9fcadb4ce3b78da932ef953350de
author Robin Lee <rgl@google.com> 1466072499 +0000
committer android-build-merger <android-build-merger@google.com> 1466072499 +0000

Merge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am: 3e343ffd91
am: c9ac672d85

Change-Id: I12cdcac2581a062313dfc0c854a184485f5fc718