tree 41fc0b32a21c36880e99b2cab5852486de736d20
parent fe288aa71450ebe04eb74d06a3ea887c6009aacb
parent bdc9420c228e0c5d4da51eaca3cdbd8db5a5c413
author Rajneesh Chowdury <rajneeshc@google.com> 1299099190 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299099190 -0800

am 2a373979: (-s ours) Adapt to changes in AwesomePlayer for Honeycomb branch - DO NOT MERGE

* commit '2a373979d85649bcb2c67f3751836a2ced6bf1ec':
  Adapt to changes in AwesomePlayer for Honeycomb branch - DO NOT MERGE