Andreas Gampe db64454b33 resolved conflicts for merge of b6b9fe21 to master ...

Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9

2015-03-13 00:04:10 -07:00

..

java/com/android/server

resolved conflicts for merge of b6b9fe21 to master

2015-03-13 00:04:10 -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