Mike Lockwood ae13230b87 Merge "MIDI: API changes to support multiple ports per device"

2014-12-09 02:37:40 +00:00

..

java

Merge "MIDI: API changes to support multiple ports per device"

2014-12-09 02:37:40 +00:00

jni

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

res

am 4cb33e76: am 55034822: am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev

2014-12-09 00:19:43 +00:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00