tree d359bafc133970c4da210ac1a651ac32716e8b7c
parent f5bd5f56e17c164a880394097bc53151ab2de803
parent c7e8f9091fb783f7174c7171ba6f21b111182fab
author Sudheer Shanka <sudheersai@google.com> 1495825974 +0000
committer android-build-merger <android-build-merger@google.com> 1495825974 +0000

Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness." into oc-dev
am: c7e8f9091f

Change-Id: Ie9e4b5835a0297fd2d7cdb71d230f7833cd6b265