am 0a565f3d: am 0155a90e: Merge "How did that get there?" into klp-dev
am 0a565f3d: am 0155a90e: Merge "How did that get there?" into klp-dev

* commit '0a565f3dcf5cddb5fb5cf07541aa6c55a03241ed':
  How did that get there?

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