Gustav Sennton fd222fc2f8 resolve merge conflicts of 6cbf137 to master ...

Change-Id: Idc548a46e96464c11193cf8480d9fb4e07aa438f

2016-06-17 09:38:55 +01:00

..

java/com/android/server

resolve merge conflicts of 6cbf137 to master

2016-06-17 09:38:55 +01:00

jni

Remove Pointer Capture API

2016-06-08 20:13:53 +00:00

Android.mk

Enable boost-locked-region-priority

2016-05-19 08:27:19 +00:00