tree 281e1c9f1a0232c2d1a6fbf02e546b81333b39c5
parent e39c192937df50861067b376c7ea8a58cdc68205
parent 801a3ff80c36aa9b55dc9b360d0e59f863011a39
author Chong Zhang <chz@google.com> 1413237833 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413237833 +0000

am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev

* commit '801a3ff80c36aa9b55dc9b360d0e59f863011a39':
  handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat