OSDN Git Service

resolved conflicts for merge of 95d601f6 to master
authorPatrick Scott <phanna@android.com>
Thu, 11 Jun 2009 18:50:01 +0000 (14:50 -0400)
committerPatrick Scott <phanna@android.com>
Thu, 11 Jun 2009 18:50:01 +0000 (14:50 -0400)
commit1536e7307cd5ec7d71f9b5a40972c58846aee554
tree1cc4c575db458c9daed570e9e4d37902e512da37
parent32e14a6deccfa75490b3032bb4ddd5ae90f89de8
parent95d601f66135d078c113c58d9aaa6e4a76fd80f2
resolved conflicts for merge of 95d601f6 to master
src/com/android/browser/BrowserActivity.java