The Android Automerger 750ccd5333 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

..

java/com/android/server

Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

jni

Merge "Unbundle RemoteService on TV - part 3" into nyc-dev am: 7981e8f

2016-04-22 21:04:43 +00:00

Android.mk

Merge "Move UidRange aidl declaration to system/netd" into nyc-dev

2016-04-19 19:19:43 +00:00