summaryrefslogtreecommitdiffstats
path: root/modules/camera
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2014-01-23 23:26:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-23 23:26:23 +0000
commit8690233d7a4f0fe4b588da30a13f2f60528bdb6e (patch)
tree0172c675284a0c9719a9d8468f414fe2d1025d36 /modules/camera
parent5df2f622b93ae895ef28d3081d181d43c99461e1 (diff)
parentae2e54faf71f4ff3d96216031c66d14dfbbceb5f (diff)
downloadhardware_libhardware-8690233d7a4f0fe4b588da30a13f2f60528bdb6e.zip
hardware_libhardware-8690233d7a4f0fe4b588da30a13f2f60528bdb6e.tar.gz
hardware_libhardware-8690233d7a4f0fe4b588da30a13f2f60528bdb6e.tar.bz2
am ae2e54fa: resolved conflicts for merge of 017649d6 to klp-modular-dev
* commit 'ae2e54faf71f4ff3d96216031c66d14dfbbceb5f': Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.
Diffstat (limited to 'modules/camera')
0 files changed, 0 insertions, 0 deletions