OSDN Git Service

Merge "Show notification when failing to turn on always-on vpn" into nyc-dev
authorVictor Chang <vichang@google.com>
Thu, 31 Mar 2016 17:44:34 +0000 (17:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Mar 2016 17:44:34 +0000 (17:44 +0000)
commit5cffb81f567009e589e2bbc8ccd3dcae15147f13
tree65c9013ecca7e032451753707175a510b7c11a10
parentd09508b8fc2c6fd917ab2f69e1014fa96edf2e1d
parentb1d7142cb21de23ec9c1dddb824405bf252bffed
Merge "Show notification when failing to turn on always-on vpn" into nyc-dev
am: b1d7142

* commit 'b1d7142cb21de23ec9c1dddb824405bf252bffed':
  Show notification when failing to turn on always-on vpn

Change-Id: I76c5ad7c545294edfeb533148ba85cdcdc41dc58