tree 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent 540070ae0de97820754d48efca0d44f7f1f67d8b
parent 98ca2ec9137930ea355b407f4f7c9d3cdac11b68
author Scott Main <smain@google.com> 1274325915 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274325915 -0700

am 55f383a9: Merge "docs: add youtube video to highlights" into froyo

Merge commit '55f383a9b8da99aa48857fea27a35badc515d8bd' into froyo-plus-aosp

* commit '55f383a9b8da99aa48857fea27a35badc515d8bd':
  docs: add youtube video to highlights