tree 922eb40713fd41e4aa1aa04758b00061b8a8560f
parent 977adb98e76cc47fd8a48e3c7b997fe1beded54e
parent 4d00a13c35e67a6f812425b8dd8afe1381ac3ccd
author Robin Lee <rgl@google.com> 1487700792 +0000
committer android-build-merger <android-build-merger@google.com> 1487700792 +0000

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

Change-Id: Id22859b30b848418cbc1bcf46c74ebd2aa88cd06