am e85c56e5: am 386d8871: Merge change I0bda9c39 into eclair

Merge commit 'e85c56e507fdac9989381d02cb0cbc446b264c96' into eclair-mr2-plus-aosp

* commit 'e85c56e507fdac9989381d02cb0cbc446b264c96':
  One camera is probably sufficient
This commit is contained in:
Mike Cleron
2009-11-09 16:21:29 -08:00
committed by Android Git Automerger
+2 -2
View File
@@ -25,8 +25,8 @@
launcher:y="3" />
<favorite
launcher:packageName="com.android.camera"
launcher:className="com.android.camera.Camera"
launcher:packageName="com.cooliris.media"
launcher:className="com.cooliris.media.Gallery"
launcher:screen="1"
launcher:x="2"
launcher:y="3" />