tree 118ecce673888a74fea014638d80eb2650331837
parent e80c652add58f4491ffc4cd2c528a765b6c60975
parent 603810939485089372245530fa3319dee850c776
author Xavier Ducrohet <xav@android.com> 1322088184 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322088184 -0800

am 60381093: am 2400b2c3: Revert "Update the media_profiles.xml file to include..."  do not merge.

* commit '603810939485089372245530fa3319dee850c776':
  Revert "Update the media_profiles.xml file to include..."  do not merge.