Jean-Michel Trivi d3f58b0214 am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1-dev ...

automerge: 6fa5d8d

* commit '6fa5d8dab0314e095af07f8e58c76a3af3de0c15':
  AudioRecord: filter attributes

2014-12-26 20:33:40 +00:00

..

java/android

am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1-dev

2014-12-26 20:33:40 +00:00

jni

Merge "Revert "Fix Crash when sending null in HashMap to getKeyRequest""

2014-12-12 19:35:50 +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