tree 5b739588a09df837f67b0b01285c93cba08cf411
parent f4f74184f5f33dfc1b3e8c10c2e93c02c7b162a4
parent 6ae56056cd6f7936e6deb4e0dcfbce2da49a0e22
author Chong Zhang <chz@google.com> 1426886164 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426886164 +0000

am 6ae56056: am 052ad4d7: Merge "cts - MediaCodec async callbacks - DO NOT MERGE" into lmp-dev

* commit '6ae56056cd6f7936e6deb4e0dcfbce2da49a0e22':