tree 03c07f418c5b7309c26a7c920b1a0c463b7daff0
parent 367838be4fa10d96ddcb1ab31e89adbcb21c9e71
parent dd028e7c26a00d3faac5be975aee358eeb0fd571
author Tim Murray <timmurray@google.com> 1503518466 +0000
committer android-build-merger <android-build-merger@google.com> 1503518466 +0000

Merge "power: throttle interaction hints" into oc-dev am: 78701217fd  -s ours
am: dd028e7c26

Change-Id: I1bcc02adcc7b74d63e09db1251b13c90630ef7a9