OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 4 May 2010 00:23:01 +0000 (17:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 4 May 2010 00:23:01 +0000 (17:23 -0700)
commitfbbd2aced9ace1d063ad166d96a605446a9d2f7e
tree3e81e7b3183415ea4746ea11201d0bcce3d44dc6
parent1ff2c0df2ec8db9aa558ef1f3948ac5f3bd9d6cd
parent2ceb570ad3b37fca2169ea9f453984cebf8c372c
merge from open-source master

Change-Id: I5dbf9446b7d4409ec843ee800c82ec06bda7c8db
src/com/android/browser/BrowserBackupAgent.java
src/com/android/browser/ErrorConsoleView.java
src/com/android/browser/WebsiteSettingsActivity.java