Felipe Leme 18d6db9a68 resolve merge conflicts of a3d3da8 to nyc-mr1-dev-plus-aosp ...

am: 80f0d0f2a4

Change-Id: Ic5a8d119a95930feaf406bca83ee4a4f591675f8

2016-06-21 21:35:16 +00:00

..

java/com/android/server

resolve merge conflicts of a3d3da8 to nyc-mr1-dev-plus-aosp

2016-06-21 21:35:16 +00: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