Ivan Podogov 1ab8725378 resolve merge conflicts of 43dc6e7 to master ...

Test: make
Change-Id: I7d49e2c1480e3296f8de25d5e8e94db7b58dd8f5

2017-01-03 12:38:31 +00:00

..

java/com/android/server

resolve merge conflicts of 43dc6e7 to master

2017-01-03 12:38:31 +00:00

jni

Remove obsolete calls to IPCThreadState/ProcessState.

2016-12-29 14:54:18 +00:00

Android.mk

…