Robert Berry c5935d442d Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev ...

am: af13eeb110

Change-Id: Ibae3e0a4a9f8b2af534c44eb8a27b9d28a4177fc

2018-03-27 09:19:20 +00:00

..

java/com/android/server

Merge "Fix setRecoverySecretTypes to not always set snapshot pending" into pi-dev

2018-03-27 09:19:20 +00:00

jni

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

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

Android.bp

…