tree c70455e9465dba20e7d242c844e5ea6db2ae6022
parent 80bc56bf2a2d3a2794dde27fd2765e78caffedbc
parent 0a7f5cc9d607eee92441e28d0d72fa5d26e6f2f8
author Hugo Benichi <hugobenichi@google.com> 1499264783 +0000
committer android-build-merger <android-build-merger@google.com> 1499264783 +0000

Merge "ConnectivityServiceTest: more informative assert failures" am: 04d8a730a9
am: 0a7f5cc9d6

Change-Id: If152d2eb134f678673b76b181146874bf65fc536