Eric Laurent b4185370d2 am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into lmp-mr1-dev ...

* commit '05fce092aa2b6a7f4a8cf4b0f33f7c003eb228f3':
  AudioService: fix permission check.

2014-12-19 17:28:03 +00:00

..

java/android

Merge "AudioService: fix permission check." into lmp-mr1-dev

2014-12-19 17:11:28 +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