summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2014-06-04 23:42:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-04 23:42:58 +0000
commit2ac6c4331204d5a0ae669ae760da243d11d39963 (patch)
tree33edd8456bdca9e0e9e9f3620436877ad8c87a48 /Android.mk
parent47b24f9c934854b26dfddbbef79ee8b1d66359b9 (diff)
parent6e9c5cc6177e0e61b3b658db657dd5ab3a0a396c (diff)
downloadframeworks_base-2ac6c4331204d5a0ae669ae760da243d11d39963.zip
frameworks_base-2ac6c4331204d5a0ae669ae760da243d11d39963.tar.gz
frameworks_base-2ac6c4331204d5a0ae669ae760da243d11d39963.tar.bz2
am 97b2bc9a: Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev
* commit '97b2bc9a05a56dad609360f8fec1e5a51059e656': camera2: Change CaptureListener callbacks to include the session (api)
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions