am a840ce83: am 54e685c4: Merge "Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest" into mnc-dev
am a840ce83: am 54e685c4: Merge "Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest" into mnc-dev

* commit 'a840ce839b9a6260624655da368d98f94a6d6833':
  Add frame count option to hwuitest. Also add shadowgrid2 to hwuitest

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base