tree c8f94f3f8effed91cadb49206598ef6206ca2bb0
parent 507feec43a4b57123a5d3af1cf4257ebebbbd510
parent 433631edfebb4deeb57e196c8a89ec9acbebe3c3
author Robin Lee <rgl@google.com> 1487700337 +0000
committer android-build-merger <android-build-merger@google.com> 1487700337 +0000

Merge "Reinstate USER_PRESENT for ConnectivityService" am: 2c8229456a
am: 433631edfe

Change-Id: I2c5b9061435e17d8319a3109e28fa2a1b6f75154