am 17486b97: am ed8f94fc: Merge "Fix up device sounds." into jb-mr2-dev
am 17486b97: am ed8f94fc: Merge "Fix up device sounds." into jb-mr2-dev

* commit '17486b974940e7f129e74d89b7f8fb0473115943':
  Fix up device sounds.

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