am b353b3ca: am cf894c91: Merge "Fix CTS test. Bug #3345445" into honeycomb
am b353b3ca: am cf894c91: Merge "Fix CTS test. Bug #3345445" into honeycomb

* commit 'b353b3ca7a615b1c857514d775829d95fd6431bc':
  Fix CTS test. Bug #3345445

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