summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2015-04-30 00:27:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-30 00:27:36 +0000
commit3d7765cd6f8e473f458f23de2af62cc4a2d480c6 (patch)
tree1884f59e9ec50d8f2fa80d0e8bdab741bf1b334b /media
parentcd0f18a8ebcbd0a2f986e4df4a3351414b899c33 (diff)
parentc7bf0a6afb8918fa6fdd469cbd6383188b1d2564 (diff)
downloadframeworks_base-3d7765cd6f8e473f458f23de2af62cc4a2d480c6.zip
frameworks_base-3d7765cd6f8e473f458f23de2af62cc4a2d480c6.tar.gz
frameworks_base-3d7765cd6f8e473f458f23de2af62cc4a2d480c6.tar.bz2
am c7bf0a6a: am 3f9dc836: Merge "MidiFramer: Support realtime messages contained within SysEx messages." into mnc-dev
* commit 'c7bf0a6afb8918fa6fdd469cbd6383188b1d2564': MidiFramer: Support realtime messages contained within SysEx messages.
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions