am 324738e7: am 440f4dfa: Merge "Fix pixel test" into klp-dev
am 324738e7: am 440f4dfa: Merge "Fix pixel test" into klp-dev

* commit '324738e700c7cce33eec2e0d7f6f2e86a91def7a':
  Fix pixel test

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