OSDN Git Service

am f1300d31: am cdf96ffa: Merge "ulaw and alaw aren\'t limited to 8kHz"
authorMarco Nelissen <marcone@google.com>
Sun, 22 Mar 2015 00:40:42 +0000 (00:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 22 Mar 2015 00:40:42 +0000 (00:40 +0000)
commit76fa9ec3e831ce97aeb2f1aa688972f5b85d9c30
treeccd88ef9f0cd1fe4d1e3516c77caf448e1cc1a5e
parent9efdf956cc2eef63fef609375901d6c8df6351b6
parentf1300d31fe80c8e14cf2bbca6c7b6768110cd5ba
am f1300d31: am cdf96ffa: Merge "ulaw and alaw aren\'t limited to 8kHz"

* commit 'f1300d31fe80c8e14cf2bbca6c7b6768110cd5ba':
  ulaw and alaw aren't limited to 8kHz
include/media/stagefright/ACodec.h
media/libstagefright/ACodec.cpp