John Reck 6d6ce03a03 resolved conflicts for merge of 313c5f38 to master ...

Conflicts:
	core/java/android/view/HardwareRenderer.java

Change-Id: Ic5e4d578932fdcfe52d5f541bf1e1a93f33c32cd

2014-05-16 10:38:14 -07:00

..

android

resolved conflicts for merge of 313c5f38 to master

2014-05-16 10:38:14 -07:00

com

Merge "Notify AppOpsService of UserRestrictions and Owners"

2014-05-16 17:30:31 +00:00

jarjar-rules.txt

…

overview.html

…