tree ab0675dd0cfeee56450cd5459444708d62f522aa
parent 8fd0bf1eff025685e28e1df22877630854246908
parent b566fa91a0ad25c4db982abf4ece44d82c5bf2a3
author Roland Levillain <rpl@google.com> 1499168952 +0000
committer android-build-merger <android-build-merger@google.com> 1499168952 +0000

Merge "Revert "ConnectivityServiceTest: more informative assert failures"" am: d10790c902 am: 8f68232271 am: 3b2b9b6238
am: b566fa91a0

Change-Id: I914c3ad6074e99e313c65572e3f38144a7f8a0d9