Alan Viverette b989c5561e resolve merge conflicts of da9653a to master. ...

Change-Id: I7458452389fb7b048fe5c6daa375fd4dbb9d9766

2015-02-05 17:10:47 -08:00

..

java

resolve merge conflicts of da9653a to master.

2015-02-05 17:10:47 -08:00

jni

Add additional info to AudioPort for enum/selection API.

2015-02-04 14:37:19 -08:00

res

am c3ea7e39: am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev automerge: eb6f3f8

2015-02-05 23:21:26 +00:00

tests

Merge "Adapt to change of LOCAL_USE_JACK values"

2015-02-05 11:01:36 +00:00