tree c0ef88dc71083c9fac8cd768ee726ad38d040bd4
parent 051b14106fabeda0a6e6b5c4ce6be8d1bde21c5d
parent 37727596cc24c72e431337429c4ec456b446d8cd
author Hugo Benichi <hugobenichi@google.com> 1484542830 +0000
committer android-build-merger <android-build-merger@google.com> 1484542830 +0000

Merge "ConnectivityServiceTest: some fixes in CallbackInfo"
am: 37727596cc

Change-Id: I636b7b0ef210aaa3e130e1c1a162a35cdc099295