OSDN Git Service

Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into oc-dev
authorBryan Ferris <bferris@google.com>
Thu, 6 Jun 2019 00:01:53 +0000 (00:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jun 2019 00:01:53 +0000 (00:01 +0000)
commit7af053390ad2f4423972efa160987bf87ff67c79
tree260d6bc49a5c8a5b26b798ec1cedc82f0ad999df
parent2ca66d4d10f3a293c45c3d69e5b27a68841addc4
parent3c61bed273614a5fa89543cb60acb188a73eca0f
Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into oc-dev

* changes:
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8 am: 8c3a23e6b1 am: 22a1644e1f
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8 am: 8c3a23e6b1
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2 am: caf19dfbb8
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab
  Protect VPN dialogs against overlay.