Dianne Hackborn 4d7c8e04a2 Merge "Maybe fix needing wifi permission to dump battery stats."

2015-04-23 16:26:41 +00:00

..

java/com/android/server

Merge "Maybe fix needing wifi permission to dump battery stats."

2015-04-23 16:26:41 +00:00

jni

Merge "GraphicsJNI Canvas cleanup"

2015-04-22 20:00:46 +00:00

Android.mk

resolved conflicts for merge of 962a11ad to master

2015-03-31 11:15:39 +01:00