tree 7c6a4e78bbfca8a07af58c975450a201c4e38831
parent 1347ac810918e7db158f459824d372a2e96d4ee5
parent 8bb2cdea008fc6d9386ec0e48d5cc381347ed4e7
author Hugo Benichi <hugobenichi@google.com> 1505996077 +0000
committer android-build-merger <android-build-merger@google.com> 1505996077 +0000

Merge "Implement ConnectivityService TODO and fix many race conditions" am: f6b72dd145
am: 8bb2cdea00

Change-Id: I4a7658e1fa6946063ab86a251269413903841ee8