tree 95292933c1b1ae280574e9c6d8b8f29a952ecd34
parent 8ca47c774659a04f29e134b48a8ff942a30a0233
parent 036ab4d1938a582e7dd4341b21862786f40c0d47
author Hugo Benichi <hugobenichi@google.com> 1484543079 +0000
committer android-build-merger <android-build-merger@google.com> 1484543079 +0000

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

Change-Id: I839ed526e802b88bbed490b611f90d829b952f26