tree 1d7c2400ddbece2fddc189abb5902941aed7ca29
parent 74ab23803ce5ca12e684ebd410dd039d91e6b261
parent 3e343ffd913fe0c408c8a975a9ad442da65a498a
author Robin Lee <rgl@google.com> 1466071823 +0000
committer android-build-merger <android-build-merger@google.com> 1466071823 +0000

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

Change-Id: I6532f2e654cfd9df8ee6c649344b0b915a8381c1