OSDN Git Service

Merge "Suppress expected exception due to missing network_watchlist.xml" into pi-dev
authorRicky Wai <rickywai@google.com>
Tue, 27 Mar 2018 15:03:04 +0000 (15:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Mar 2018 15:03:04 +0000 (15:03 +0000)
commita0bda99a494ea8018ec444671431800395492507
tree494c3880653e8e32a78641abdadc287d0cb84fce
parentf60fc0ada1080fee29478e04c3512fff72b26cfb
parentfcfc753a0e988576a97c9beb0498b9f4330d602a
Merge "Suppress expected exception due to missing network_watchlist.xml" into pi-dev
am: fcfc753a0e

Change-Id: I1ecf54edcd43f05156465c6130e2629894ffabd4