summaryrefslogtreecommitdiffstats
path: root/camera/Camera.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-08-29 15:32:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-29 15:32:03 -0700
commit544b67a04b4289aaafa852cbab54abf1f3d6a5bf (patch)
tree8ae19d56b416a17a218c4c405939acad3fe8cb1e /camera/Camera.cpp
parentf45002335606a9edb181814fbdf8d0a4e1468a9d (diff)
parentd8ee4e56f92eeb44ddc0997efe280b9f28ad814d (diff)
downloadframeworks_av-544b67a04b4289aaafa852cbab54abf1f3d6a5bf.zip
frameworks_av-544b67a04b4289aaafa852cbab54abf1f3d6a5bf.tar.gz
frameworks_av-544b67a04b4289aaafa852cbab54abf1f3d6a5bf.tar.bz2
am d8ee4e56: Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev
* commit 'd8ee4e56f92eeb44ddc0997efe280b9f28ad814d': Initial checkin of support for acting as a wifi display source
Diffstat (limited to 'camera/Camera.cpp')
0 files changed, 0 insertions, 0 deletions