am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread
am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread

Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp

* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
  Added damr box for AMR (NB and WB) sample entry

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base