tree 41dafc483420a2dd4fedc339e20c5187c1395702
parent c7d927466e6314315743e5c98730b3a79c52e892
parent 62ade220d9b72a9edc8fcc4dfe98ca9541c6d501
author Dirk Dougherty <ddougherty@google.com> 1319072836 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319072836 -0700

am 62ade220: Merge "Doc change: add video to platform highlights and fix a few things." into ics-mr0

* commit '62ade220d9b72a9edc8fcc4dfe98ca9541c6d501':
  Doc change: add video to platform highlights and fix a few things.