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

Merge commit 'e7672d0041f7d4093cac6db1233cd22b5cc45a01' into eclair-mr2-plus-aosp

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