am 059aedf8: Merge "Finish this bit before I forget." into jb-mr1-dev
am 059aedf8: Merge "Finish this bit before I forget." into jb-mr1-dev

* commit '059aedf808c8b9b3da1457eef52f3d477878d50b':
  Finish this bit before I forget.

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