tree d2450ba0fd65ef0b67f5b20835a41ab217687cd4
parent 887a192ee108c951cf44d85edd20d42b2d4bbcb0
parent 1421827bae5a1913f4d7a04099a54aeb47045d9a
author Jonathan Dixon <joth@google.com> 1379785642 -0700
committer Jonathan Dixon <joth@google.com> 1379785708 -0700

resolved conflicts for merge of 1421827b to master

Simple resolve: two new methods added to same class.

Conflicts:
	core/java/android/webkit/WebViewFactoryProvider.java

Change-Id: Ic8b26f2a51279348b19a9c5b30d492f67d62ca81