tree 9d97f8d3bf160fe5657e7acc87a4087095650bf5
parent 51a260d8c6e9a5c6b6c2cf808554ae013c1a7bef
parent a788026fd35eee2190dc7635e1fdbc781f6ef668
author James Dong <jdong@google.com> 1280855431 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280855431 -0700

am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread

Merge commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668' into gingerbread-plus-aosp

* commit 'a788026fd35eee2190dc7635e1fdbc781f6ef668':
  Fixed a typo in a method name of MediaPlayerPerformance.java class