am 73fddbae: Merge "Don\'t break the build... update to 11.xml." into honeycomb
am 73fddbae: Merge "Don\'t break the build... update to 11.xml." into honeycomb

* commit '73fddbae964ee41895c8218454d0ed7fd71d6913':
  Don't break the build... update to 11.xml.

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