am 1cb2e760: am bf2ac88f: am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev
am 1cb2e760: am bf2ac88f: am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev

* commit '1cb2e7603e13c23594b5a03b56f2fafd09d94c38':
  Update VpnService Javadoc to reflect new UX.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base