OSDN Git Service

Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into nyc-mr2-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)
commit3d538100334e5fa658fd529480a939a5f5b1d9e9
tree1a5690b5c0f346c7d94c88a96fc6cb29cacbf897
parent31737b4618d5f67c1a0b120f98c386c7a5278a7a
parent22a1644e1f6f4fbb5433b723cf06eb2a6132d14c
Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into nyc-mr2-dev

* changes:
  [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.