tree 5b6d891878c9a762cf16899c1c618070efb289b7
parent f4f9a3015e2bc0530a77977473c3c693f8563163
parent 90b9a6a4ab30fc162aee71b4dc484b3839534369
author Mike Lockwood <lockwood@google.com> 1423785703 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1423785708 +0000

Merge "MidiManager API tweaks:"