summaryrefslogtreecommitdiffstats
path: root/services/soundtrigger
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@google.com>2014-12-23 06:09:03 -0800
committerThe Android Automerger <android-build@google.com>2014-12-23 06:09:03 -0800
commitc63c797b6028560b3b2942fa37ad7eec8b481ccd (patch)
tree77638d29013a8bae57a7232e4aa5ea71baadc341 /services/soundtrigger
parent0d19abb440c7e62e944efbeadf02299990f9a589 (diff)
parenta1aad21c7dc48442987734b68cb7cc73f405e4a5 (diff)
downloadframeworks_av-c63c797b6028560b3b2942fa37ad7eec8b481ccd.zip
frameworks_av-c63c797b6028560b3b2942fa37ad7eec8b481ccd.tar.gz
frameworks_av-c63c797b6028560b3b2942fa37ad7eec8b481ccd.tar.bz2
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Diffstat (limited to 'services/soundtrigger')
0 files changed, 0 insertions, 0 deletions