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

* commit '9aa5cb76f3b0486afcd9b3ff445d8d082793f2b5':
  MediaSessionLegacyHelper uses global Application context

2014-12-19 11:47:38 +00:00

..

java/android

Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev

2014-12-19 11:37:04 +00:00

jni

am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"

2014-12-11 21:02:08 +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