OSDN Git Service

Merge "Include login/alwayson in legacy VPN editor dialog" into nyc-dev
authorRobin Lee <rgl@google.com>
Wed, 13 Apr 2016 15:36:11 +0000 (15:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Apr 2016 15:36:11 +0000 (15:36 +0000)
am: 80c5d6d

* commit '80c5d6db754a941537711d78c8591c872adc735c':
  Include login/alwayson in legacy VPN editor dialog

Change-Id: I599a7b0609f0f141a54cc975c97801192bf17f24


Trivial merge