Mike Lockwood 43bbe4a1e7 Merge "MidiManager: Improve Javadoc"

2014-12-11 17:26:40 +00:00

..

java

Merge "MidiManager: Improve Javadoc"

2014-12-11 17:26:40 +00:00

jni

am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

2014-12-10 21:57:35 +00:00

res

am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev automerge: 76dc7a1

2014-12-11 10:23:14 +00:00

tests

Merge "Allow compilation with Jack."

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