am c83d46a2: Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev
am c83d46a2: Merge "Add near-ultrasound properties to AudioManager.java" into mnc-dev

* commit 'c83d46a277c563e0f60bb1b8c3478165de2c121a':
  Add near-ultrasound properties to AudioManager.java

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