Jean-Michel Trivi 83d0c86b86 am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev ...

* commit 'd14f98fdcec65daae9f4db04f827036e5317b55c':
  Support collaborative audio focus handling

2014-12-08 19:39:10 +00:00

..

java/android

Merge "Support collaborative audio focus handling" into lmp-mr1-dev

2014-12-07 01:14:30 +00:00

jni

am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters"

2014-11-25 19:04:05 +00:00

lib

…

mca

Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

2014-12-04 01:04:09 +00:00

tests

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

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