OSDN Git Service

resolved conflicts for merge of 918e1d78 to eclair
authorGrace Kloba <klobag@google.com>
Tue, 18 Aug 2009 15:42:32 +0000 (08:42 -0700)
committerGrace Kloba <klobag@google.com>
Tue, 18 Aug 2009 15:42:32 +0000 (08:42 -0700)
commitec1b5ad8d8283b1fbbc5d7fa1cd50ef95b9e594d
treebabea65c56874cbf932b18cb875ddc7e89ea28a7
parenta11b75a4ef9cb8e264e59e3d2aadd56cf62e2afe
parent918e1d78b2db6ef21c71a07868572d9cda498476
resolved conflicts for merge of 918e1d78 to eclair
src/com/android/browser/BrowserActivity.java