am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdk
am 25aa87b2: am d14f1bd7: Merge change Iacb6e122 into eclair-sdk

Merge commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120' into eclair-mr2

* commit '25aa87b2fdd065637cc87cb4b3e58b828aa29120':
  docs: add 2.0 video to developer site feature videos

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