tree eda7bee909cf5a3b4f52c08a7ffe71eba009ebf0
parent 13b479606bb405673a81d5b7576c8d9ad409b06c
parent 7121db60a9449d641d0df1a6ec7dd73db6fb9846
author Jason Monk <jmonk@google.com> 1461079958 +0000
committer android-build-merger <android-build-merger@google.com> 1461079958 +0000

Merge "Merge "No QS hotspot unless supported" into nyc-dev am: 93e742b am: 87be8c2" into nyc-mr1-dev-plus-aosp
am: 7121db6

* commit '7121db60a9449d641d0df1a6ec7dd73db6fb9846':

Change-Id: I6e4554eca4554596c7728896d062fc68ea7cadde