am 90390e69: (-s ours) am 5c61228b: Merge "Updated media playback controls, unlock screen, misc framework assets" into gingerbread

Merge commit '90390e6918e8c05fd1746fd16051a21c5dd1c7bf'

* commit '90390e6918e8c05fd1746fd16051a21c5dd1c7bf':
  Updated media playback controls, unlock screen, misc framework assets
This commit is contained in:
Justin Ho
2010-10-11 17:48:24 -07:00
committed by Android Git Automerger

Diff Content Not Available