tree c8f94f3f8effed91cadb49206598ef6206ca2bb0
parent 042be0bd84f37bdd9c7e447a4073c22863021a3d
parent 2c8229456ad7e987fb4d9e2ddabd3b4c26dcdc53
author Robin Lee <rgl@google.com> 1487699707 +0000
committer android-build-merger <android-build-merger@google.com> 1487699707 +0000

Merge "Reinstate USER_PRESENT for ConnectivityService"
am: 2c8229456a

Change-Id: If8b7239cdabdd79d9ea24baf99e95c6ec1a9acf3