summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2010-06-07 18:49:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-07 18:49:07 -0700
commitd5f401ba51d9f200cd25ee58eec99134576d78d9 (patch)
tree010e6f8972e60da2d487e66763df9ab9402d703c /camera
parent04cadabd953cf04bdca5f48d3363288bb0081c5e (diff)
parentac24d23cd4a96f38b4e9cb0318a7c298794b9b6a (diff)
downloadframeworks_base-d5f401ba51d9f200cd25ee58eec99134576d78d9.zip
frameworks_base-d5f401ba51d9f200cd25ee58eec99134576d78d9.tar.gz
frameworks_base-d5f401ba51d9f200cd25ee58eec99134576d78d9.tar.bz2
am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
Merge commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into froyo-plus-aosp * commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a': Don't bring up Launcher until after boot complete
Diffstat (limited to 'camera')
0 files changed, 0 insertions, 0 deletions