tree d32c5815b0b6c5a99d28f763c2a37e1c30378c08
parent 0b0081e2d0c0bf6db32a344b256fff106a6d94b7
parent d7e258116a09069865e412cc8ea9cd0a069dd828
author Tim Murray <timmurray@google.com> 1500334085 +0000
committer android-build-merger <android-build-merger@google.com> 1500334085 +0000

Merge "power: throttle interaction hints" into oc-dr1-dev am: d12ecb1ed5
am: d7e258116a

Change-Id: Ie12d0f6e1f212245f55b0440ffd2f696a206ce4a