summaryrefslogtreecommitdiffstats
path: root/services/camera/libcameraservice/gui
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2013-11-15 08:27:06 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-15 08:27:06 -0800
commitb4213a1252c23115f3fac77101adb33a9c6b9423 (patch)
tree1477fe0312af38a2a24e655f7d62d7c1b9b1f38f /services/camera/libcameraservice/gui
parentb5099903c059dc913e0e592969c10d15fac0c14c (diff)
parent576e89b523d7705545032edc67d98d9ab1dedbd2 (diff)
downloadframeworks_av-b4213a1252c23115f3fac77101adb33a9c6b9423.zip
frameworks_av-b4213a1252c23115f3fac77101adb33a9c6b9423.tar.gz
frameworks_av-b4213a1252c23115f3fac77101adb33a9c6b9423.tar.bz2
am 576e89b5: am 7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-dev
* commit '576e89b523d7705545032edc67d98d9ab1dedbd2': AwesomePlayer: correct stream type for offload
Diffstat (limited to 'services/camera/libcameraservice/gui')
0 files changed, 0 insertions, 0 deletions