summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-11-15 00:47:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-15 00:47:38 +0000
commit27c3f7728c6c576c49245a7bd9688505ec1f5357 (patch)
tree9943178b96589f9bbd684d410e02425ca292db09 /services/audiopolicy
parent9ac0177da562b8f4d2ac6f001a16658a76e6aad8 (diff)
parent339b5f778354cb221e5f76c1c2a5df497301da6b (diff)
downloadframeworks_av-27c3f7728c6c576c49245a7bd9688505ec1f5357.zip
frameworks_av-27c3f7728c6c576c49245a7bd9688505ec1f5357.tar.gz
frameworks_av-27c3f7728c6c576c49245a7bd9688505ec1f5357.tar.bz2
am 339b5f77: am a82b5f57: Merge "libstagefright: use __predict_false from bionic rather than CONDITION from log/log.h"
* commit '339b5f778354cb221e5f76c1c2a5df497301da6b': libstagefright: use __predict_false from bionic rather than CONDITION from log/log.h
Diffstat (limited to 'services/audiopolicy')
0 files changed, 0 insertions, 0 deletions