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

* commit '7d5c51117dae79665660df28a0f3b24e6fe75fbd':
  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