Jeff Sharkey a320505f3a Merge "Move both app code and data together." into mnc-dev

2015-05-01 16:22:46 +00:00

..

java/com/android/server

Merge "Move both app code and data together." into mnc-dev

2015-05-01 16:22:46 +00:00

jni

Merge "A bunch more cleanups" into mnc-dev

2015-05-01 14:42:51 +00:00

Android.mk

resolved conflicts for merge of 962a11ad to master

2015-03-31 11:15:39 +01:00