OSDN Git Service

resolved conflicts for merge of bb074ef9 to master
authorJean-Baptiste Queru <jbq@google.com>
Thu, 28 Jan 2010 23:14:57 +0000 (15:14 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 28 Jan 2010 23:21:25 +0000 (15:21 -0800)
commitd09f4aaba224bf2a94e75906a5b6bc27c2ab9ad7
tree01cec11fd8d09e50c85db4c03590c2878b2ba43d
parent59e8fc5f53ccb9d575611fb638d992e121fd2c2e
parentbb074ef9c27711be9148ed6b9decf8e6feb9267b
resolved conflicts for merge of bb074ef9 to master

Change-Id: I2d78d1280b56928f65517203348ddbd403fa9eae
core/java/android/webkit/WebView.java
core/java/android/webkit/WebViewCore.java