OSDN Git Service

resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Oct 2010 16:38:10 +0000 (09:38 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Mon, 11 Oct 2010 16:38:10 +0000 (09:38 -0700)
commite69f1f1a748da99c82bcb56f6c7107a5618ba906
tree8c21c9549667afbc32ff9841e28c055f9259b1cc
parentdf08c2f03e7cf7be7002d34efe8e4e8d24e406de
parente3cfd35bf4d430e56456818bf8c84ef4c2c0dfde
resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp

Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea
core/java/android/webkit/WebView.java