Jean-Michel Trivi 17bee9ca7d am e19bb5c0: am 213472d7: am 8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev ...

* commit 'e19bb5c092309fad108e556e2e76ab13c0c17786':
  Add support for audio focus locking

2014-11-25 17:55:48 +00:00

..

java/android

am e19bb5c0: am 213472d7: am 8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev

2014-11-25 17:55:48 +00:00

jni

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

2014-11-20 23:29:08 +00:00

lib

…

mca

Move frameworks/base over to libc++.

2014-11-12 11:22:20 -08:00

tests

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

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