OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7032c59 21006fa)
am 21006fa5: (-s ours) am 5865ddf7: Merge "AudioTrack::dump null mCblk check test"
authorMarco Nelissen <marcone@google.com>
Mon, 26 Nov 2012 19:20:33 +0000 (11:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 26 Nov 2012 19:20:33 +0000 (11:20 -0800)
* commit '21006fa5fa180d1eb1513a5ae297211a24312021':
  AudioTrack::dump null mCblk check test


Trivial merge
frameworks/av
About OSDN
Find Software
Develop Software
Help