am b4597aae: Merge "Fix my fix." into jb-mr1-dev
am b4597aae: Merge "Fix my fix." into jb-mr1-dev

* commit 'b4597aaea48cbac9dfc38d02059808e74897698a':
  Fix my fix.

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