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