am 3c04cc44: Merge "Don\'t talk about Froyo as if it\'s still in the future."
am 3c04cc44: Merge "Don\'t talk about Froyo as if it\'s still in the future."

* commit '3c04cc44c400d0ed2155428fa50d5facc91cd893':
  Don't talk about Froyo as if it's still in the future.

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