tree a82da95a9dc73ec8fd387955cd0222c35617fe95
parent b614933a9cf99a6ebd55ae7abced9663d5d624a8
parent 8bcbabbfb8603875fb7e9eb0c6ea3cc3a5a06f00
author Marco Nelissen <marcone@google.com> 1353957633 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353957633 -0800

am 21006fa5: (-s ours) am 5865ddf7: Merge "AudioTrack::dump null mCblk check test"

* commit '21006fa5fa180d1eb1513a5ae297211a24312021':
  AudioTrack::dump null mCblk check test