summaryrefslogtreecommitdiffstats
path: root/libcamera
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-11-15 11:30:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-15 11:30:14 -0800
commita3dedab1e0072c00af3c9498cbad68c3394a72f7 (patch)
tree7a8445087571b63d8e419cf681a7f9c26172d122 /libcamera
parent1dfd26aaff22fe1ffacf39751d50862786d369d5 (diff)
parent5c570a5fba7509bd4912f7d2b7ca948faab9fd91 (diff)
downloaddevice_samsung_crespo-a3dedab1e0072c00af3c9498cbad68c3394a72f7.zip
device_samsung_crespo-a3dedab1e0072c00af3c9498cbad68c3394a72f7.tar.gz
device_samsung_crespo-a3dedab1e0072c00af3c9498cbad68c3394a72f7.tar.bz2
am 5c570a5f: Merge "Follow-up fixes to NFC access control changes." into ics-mr1
* commit '5c570a5fba7509bd4912f7d2b7ca948faab9fd91': Follow-up fixes to NFC access control changes.
Diffstat (limited to 'libcamera')
0 files changed, 0 insertions, 0 deletions