am a82444ad: am 5f6e583c: Merge "Don\'t break the build!" into honeycomb
am a82444ad: am 5f6e583c: Merge "Don\'t break the build!" into honeycomb

* commit 'a82444ad3aa87cc8ce8a585a6e1937ac6cd9ee18':
  Don't break the build!

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