tree 54b83e37b2b3331013745b24f11afb8fa4ae07e0
parent bdc7f435711950b83274c591eb88143169a9deb9
parent 0de55a338666a847b55d404aa20246f24bef88e5
author Mike Lockwood <lockwood@android.com> 1254762784 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254762784 -0700

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Browser into eclair-mr2-plus-aosp