summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-09-03 17:53:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-03 17:53:46 -0700
commitafb0317fa09280cc57ccd1ab11efa5dfc8ff2235 (patch)
tree6c89a2731ea1427f55898dd56b77ecccf3026072 /packages
parentc80531ae5f87335aeb03b520169bb2340f2b9726 (diff)
parent6cbd7a8f4fd921ea1b0ad3d1da0580b384a1855e (diff)
downloadframeworks_base-afb0317fa09280cc57ccd1ab11efa5dfc8ff2235.zip
frameworks_base-afb0317fa09280cc57ccd1ab11efa5dfc8ff2235.tar.gz
frameworks_base-afb0317fa09280cc57ccd1ab11efa5dfc8ff2235.tar.bz2
am 6cbd7a8f: am 979cf8e4: Merge "camera2: Don\'t NPE when closing the CameraDevice" into klp-dev
* commit '6cbd7a8f4fd921ea1b0ad3d1da0580b384a1855e': camera2: Don't NPE when closing the CameraDevice
Diffstat (limited to 'packages')
0 files changed, 0 insertions, 0 deletions