tree d07e1c7aafdbb0ecc07ae56b288a3f64a05e92e2
parent c02f85f0cde6c1a64aeec34da134461e3734a564
parent 0e7abd3fba03e7ffd154e99f990b58277aa87d0e
author Robin Lee <rgl@google.com> 1466072046 +0000
committer android-build-merger <android-build-merger@google.com> 1466072046 +0000

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

Change-Id: I897c48083f8e6786182d023c58f9861996c6d25c