OSDN Git Service

resolved conflicts for merge of cc634036 to master
authorAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2009 00:03:43 +0000 (17:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2009 00:03:43 +0000 (17:03 -0700)
commit438c5e64fc822cf1bac0648d7964988972d7d4e0
tree1bcbfae501bc08884fdf83dcbeb99fec50a2c6b2
parent907c5763bb700c705108948328c8892500e59185
parentcc63403643786905262f505ab5266d8e80b9924c
resolved conflicts for merge of cc634036 to master
src/com/android/browser/BrowserActivity.java