summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-12-20 13:11:53 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-20 13:11:53 -0800
commit94023fa6744e24f26f0aba1699ec278649bd66df (patch)
treea0184b1a6a55a924143411129a4cd13d9dbcaa08 /camera
parent12d9702773c8a3242a44dd6528126c9ff0dade43 (diff)
parent183c525aee3b683f6d92b0b6e7197a3989ddee1a (diff)
downloadframeworks_av-94023fa6744e24f26f0aba1699ec278649bd66df.zip
frameworks_av-94023fa6744e24f26f0aba1699ec278649bd66df.tar.gz
frameworks_av-94023fa6744e24f26f0aba1699ec278649bd66df.tar.bz2
am 21cb1290: Reconcile with ics-mr1-release
* commit '21cb1290b578a4bceac003c276c00911fcd6c9d4':
Diffstat (limited to 'camera')
0 files changed, 0 insertions, 0 deletions