am 386d8871: Merge change I0bda9c39 into eclair

Merge commit '386d8871dc24bfcc91a1d9f7b228a13745bed60a' into eclair-mr2

* commit '386d8871dc24bfcc91a1d9f7b228a13745bed60a':
  One camera is probably sufficient
This commit is contained in:
Mike Cleron
2009-11-09 16:16:15 -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" />