summaryrefslogtreecommitdiffstats
path: root/include/camera
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-11 22:05:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-11 22:05:19 +0000
commit8e1554f35ffcc0f7ac833a796adf3926371fcb76 (patch)
tree16a15b50c6cc47a120ccae11a8bc8fbd2a9d3ae6 /include/camera
parent0f37620e0f79bfab1354e2e3049c260342a2637e (diff)
parentb1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9 (diff)
downloadframeworks_av-8e1554f35ffcc0f7ac833a796adf3926371fcb76.zip
frameworks_av-8e1554f35ffcc0f7ac833a796adf3926371fcb76.tar.gz
frameworks_av-8e1554f35ffcc0f7ac833a796adf3926371fcb76.tar.bz2
am b1b1e303: am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"
* commit 'b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9': Fix aosp_arm64 mirror-aosp-master build 1119326
Diffstat (limited to 'include/camera')
0 files changed, 0 insertions, 0 deletions