OSDN Git Service

Merge "Show "no vpns added" for empty vpn screen" into nyc-dev
authorRobin Lee <rgl@google.com>
Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)
commit8af9a7452948be260ac6fcb7f0230b0f347a6aee
tree626ffc56f36a263e433cb6e214c60cc511b5d3ad
parentecd0f417efdda8a4ff18f60733be3813285c3dff
parentd0979a540b158485a7766e3466589f6cf171d2a7
Merge "Show "no vpns added" for empty vpn screen" into nyc-dev
am: d0979a5

* commit 'd0979a540b158485a7766e3466589f6cf171d2a7':
  Show "no vpns added" for empty vpn screen