tree d49fd339204bd83d9feb902c52251ea49404b6d7
parent 10dd3d7a84d2e5604d9a7e256646c5ed682d0280
parent ed64e61b5fce76e6eabcf45641021f1fd169e213
author Felipe Leme <felipeal@google.com> 1463083731 +0000
committer android-build-merger <android-build-merger@google.com> 1463083731 +0000

Merge "Covers more corner cases on restricted network modes:" into nyc-dev
am: b10c777ceb

* commit 'b10c777cebf2a86605f850c4181f45dc67d2a9a6':
  Covers more corner cases on restricted network modes:

Change-Id: I8fd7ddb841e40f9e5697be2e5f2b109fcc71bf33