Dan Albert f9974e9aaa am 6746b74d: resolved conflicts for merge of 1a4527ce to lmp-mr1-dev-plus-aosp ...

* commit '6746b74de540f2899f886cd25827f3ca9901de32':
  Clean up makefile cruft.

2014-09-19 23:31:21 +00:00

..

java/android

am d4fcdd1f: am 85467640: am f88be2c7: Merge "Adjust volume bar visibility in HDMI-CEC system audio mode" into lmp-dev

2014-09-17 02:24:06 +00:00

jni

am 7a3c88e0: am 6bc4e4b4: am 0b381432: Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev

2014-09-11 17:25:51 +00:00

lib

…

mca

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

2014-09-19 16:13:49 -07:00

tests

…