summaryrefslogtreecommitdiffstats
path: root/include/hardware/audio.h
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-06-26 12:37:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-26 12:37:51 -0700
commit6a96df3b335f8fc1b514fdcf95e8ded350fcf2b5 (patch)
tree0dd129a134165395c5c0c6005157c95b45df676c /include/hardware/audio.h
parent12dc899cb6135f101bf21a78583508a956bb1d6d (diff)
parent0ab04716dcb05f085edcc80bbed3ecefcbec9c46 (diff)
downloadhardware_libhardware-6a96df3b335f8fc1b514fdcf95e8ded350fcf2b5.zip
hardware_libhardware-6a96df3b335f8fc1b514fdcf95e8ded350fcf2b5.tar.gz
hardware_libhardware-6a96df3b335f8fc1b514fdcf95e8ded350fcf2b5.tar.bz2
am 0ab04716: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '0ab04716dcb05f085edcc80bbed3ecefcbec9c46':
Diffstat (limited to 'include/hardware/audio.h')
0 files changed, 0 insertions, 0 deletions