Jeff Sharkey 96d2002518 Merge "Don't let callers OOM the system process." into pi-dev ...

am: c08aa83b48

Change-Id: I9698aab0d98c564ad7779462485576121e9bc815

2018-03-27 20:08:50 +00:00

..

java/com/android/server

Merge "Don't let callers OOM the system process." into pi-dev

2018-03-27 20:08:50 +00:00

jni

Merge "Write descriptors for Mtp in UsbService" into pi-dev

2018-03-27 02:49:02 +00:00

Android.bp

…