Rubin Xu 3ba5331a83 resolve merge conflicts of 4daa1b7 to master ...

Change-Id: I5292c074234fccc26c7a843f56eb68edce26d678

2016-09-15 10:42:50 +01:00

..

java/com/android/server

resolve merge conflicts of 4daa1b7 to master

2016-09-15 10:42:50 +01:00

jni

Revert "Enable migration to big cores for app launches."

2016-09-06 18:17:11 -07:00

Android.mk

…