OSDN Git Service

Merge "ConnectivityServiceTest: some fixes in CallbackInfo" am: 37727596cc am: 036ab4...
authorHugo Benichi <hugobenichi@google.com>
Tue, 17 Jan 2017 06:48:05 +0000 (06:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jan 2017 06:48:05 +0000 (06:48 +0000)
commita4655be7bb05afa9fa9d34863a070cad3508a583
treed492d4f7099ee3b16db97a7dc1fad8efdf28f60a
parentfff1e744e3f72094e81b01134752d8f48c86d8e5
parent2c05563e78c90cd446c047c296e41afd764aafc0
Merge "ConnectivityServiceTest: some fixes in CallbackInfo" am: 37727596cc am: 036ab4d193 am: a5e0160f03
am: 2c05563e78  -s ours

Change-Id: I2877281247a78e4d814a1df8bea71fd3c37b1962