OSDN Git Service

Merge "Make sure network tests pass with airplane mode on" into oc-mr1-dev
authorJason Monk <jmonk@google.com>
Mon, 14 Aug 2017 18:03:12 +0000 (18:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Aug 2017 18:03:12 +0000 (18:03 +0000)
commit61d0fd0e70cf0e7162ed5a641a8f8ea6ce1e9686
treed27e1c82ea3da85bfb6f8d376e5d9d3652c58592
parentc9f6d383786b1bdca680a0b0fb8021f1cf4b3929
parentd35b6a7c26b8de3bda29cd95d433f75dcd8c05fc
Merge "Make sure network tests pass with airplane mode on" into oc-mr1-dev
am: d35b6a7c26

Change-Id: I48f774cf277543c5224958520e3bd78aac776a0c