Oliver Woodman c2597f0e09 am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev ...

automerge: 20e52c3

* commit '20e52c3453b2683cccfc4ac0841c9d6ef0796f88':
  MediaSessionLegacyHelper uses global Application context

2014-12-19 11:49:15 +00:00

..

java/android

am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev

2014-12-19 11:49:15 +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