summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-11-21 02:57:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-21 02:57:50 +0000
commit2fd47f8cfe314dd9d01f401408b70ad8d443518b (patch)
tree34a2e30a7f07f8b7a3b106af24cf63c80aa77ca5 /camera
parent93535715c6d2cac06d5dc6f8e3d8f15a19c21e60 (diff)
parent58cc16ef6b3a6d0e26566203cc6c094a8c036bc7 (diff)
downloadframeworks_av-2fd47f8cfe314dd9d01f401408b70ad8d443518b.zip
frameworks_av-2fd47f8cfe314dd9d01f401408b70ad8d443518b.tar.gz
frameworks_av-2fd47f8cfe314dd9d01f401408b70ad8d443518b.tar.bz2
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-mr1-dev-plus-aosp
Diffstat (limited to 'camera')
0 files changed, 0 insertions, 0 deletions