OSDN Git Service

Merge commit 'remotes/korg/cupcake' into merge
authorJean-Baptiste Queru <jbq@google.com>
Tue, 17 Mar 2009 23:31:53 +0000 (16:31 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 17 Mar 2009 23:31:53 +0000 (16:31 -0700)
commite3fdcaf62ccb6092c43b39c2b990b47eae3ab1b7
treeea147afbdd5fef93eabde1d7f67521e50bfd2534
parent53c65cacd7f216bd68cac56ba739deed2de63a30
parentf59ec877363eaf43118677f249008eddc7a9ce11
Merge commit 'remotes/korg/cupcake' into merge

Conflicts:
src/com/android/browser/BrowserActivity.java
src/com/android/browser/BrowserActivity.java