Andreas Gampe 1b4e56ac36 resolved conflicts for merge of 1d67698b to master ...

Change-Id: I866d342320c34e91494b4c70f27d0b79ec33358b

2015-03-13 00:17:40 -07:00

..

java/com/android/server

resolved conflicts for merge of 1d67698b to master

2015-03-13 00:17:40 -07:00

jni

MidiManager updates:

2015-01-14 16:51:54 -08:00

Android.mk

Split up android.policy into framework.jar and services.jar 1/3

2015-02-10 14:56:02 +01:00