Commit 8edbf268 authored by Yuichi Araki's avatar Yuichi Araki Committed by Android Git Automerger
Browse files

am 6f436296: resolved conflicts for merge of aaaefedd to mnc-dev 

* commit '6f436296':
  MidiScope: Add a new sample
parents f7be9464 6f436296
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment