Jonathan Dixon 90102e2ccc 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

2013-09-21 10:48:28 -07:00

..

android

resolved conflicts for merge of 1421827b to master

2013-09-21 10:48:28 -07:00

com

am f3d1ef00: am af638c4f: Merge "Add camera affordance to navigation bar on phones" into klp-dev

2013-09-20 11:21:11 -07:00

jarjar-rules.txt

…

overview.html

…