tree eda7bee909cf5a3b4f52c08a7ffe71eba009ebf0
parent 52beb3870b972312ef31dfbf509662547f3adccc
parent 3b0dc0858933f83dddf867c9942cc6c7199eeab4
author Jason Monk <jmonk@google.com> 1461079955 +0000
committer android-build-merger <android-build-merger@google.com> 1461079955 +0000

Merge "No QS hotspot unless supported" into nyc-dev am: 93e742b am: f7d9285
am: 3b0dc08

* commit '3b0dc0858933f83dddf867c9942cc6c7199eeab4':
  No QS hotspot unless supported

Change-Id: If56db20af5cc72f6f479bb042d9da952a5fb5573