tree 983f44c2d34d6021d99c8586ac06e1e6d245f396
parent 6bbeeb92e27f39dc0d87ef354c3515b8afbf0811
parent 74803645af905efd86ecf293fe80192b7c30c0c0
author Hugo Benichi <hugobenichi@google.com> 1504600794 +0000
committer android-build-merger <android-build-merger@google.com> 1504600794 +0000

Merge "ConnectivityService: improve wakelock logging" into oc-mr1-dev am: 2dac2cce5a
am: 74803645af

Change-Id: Iabe99993001e069b8a8077533bca1fa7fb2f59ba