OSDN Git Service

Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into nyc-mr1-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)
commit266c76f8e5e763d426edf2fe1872827740426224
tree162258e0d7ad2f2eee9aad4b054d975565cb6f22
parent6d72c0681f22d13245d195f1d7b636f7e758c5aa
parentcaf19dfbb82a9c12136fa97132d08270a7a269e4
Merge changes from topic "am-641f3aa3-ebd9-46aa-8f39-1f4ec4f86eb3" into nyc-mr1-dev

* changes:
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab am: e2100ac8f2
  [automerger] Protect VPN dialogs against overlay. am: 016c72c8ab
  Protect VPN dialogs against overlay.