OSDN Git Service

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

* commit '70dffcbd7783ed726addf8c4cb1f6ce068b65212':
  Include login/alwayson in legacy VPN editor dialog

Change-Id: I185821c057c2c57ce2ed133a1cb873abf30a8d9c