am 01017cdf: Merge "Some new ICS target SDK changes."
am 01017cdf: Merge "Some new ICS target SDK changes."

* commit '01017cdf7452baa13908cba6aa26632114544b33':
  Some new ICS target SDK changes.

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