Skip to content
Commit e49b490c authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

[automerger skipped] Merge "Move MidiDeviceInfo to libamidi, its only user"... 

[automerger skipped] Merge "Move MidiDeviceInfo to libamidi, its only user" am: 7a2fb04c am: e399a7f8 am: 72fab3af
am: 047c4080 -s ours
am skip reason: change_id I16b62ef8288bc68a46ae9ac6318efb95fa469e4f with SHA1 92672807 is in history

Change-Id: Ifbd9120e171da2f038b04e50e0abfedc590d8a65
parents f1f26c2c 047c4080
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment