Narayan Kamath b7974bd31d am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release" ...

* commit 'dd65a4f735a311fe60c065449e394974807ff297':
  Race-condition in SoundPool during release

2015-01-05 18:08:06 +00:00

..

java/android

Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev

2014-12-24 01:16:14 +00:00

jni

am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"

2015-01-05 18:08:06 +00:00

lib

…

mca

Cleanup Obsolete LOCAL_PRELINK_MODULE.

2014-12-16 12:45:49 -08:00

tests

resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp

2014-11-21 09:57:52 -08:00