am 466c58d4: am f3c2eb79: am d6344d76: Merge "Work around a possible driver bug Bug #7296475" into jb-mr1-dev
am 466c58d4: am f3c2eb79: am d6344d76: Merge "Work around a possible driver bug Bug #7296475" into jb-mr1-dev

* commit '466c58d4e179d3d04e5b3785090c298a1bad79b3':
  Work around a possible driver bug Bug #7296475

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