Hugo Benichi 0537f16516 Merge "ConnectivityManager: allow usage of TYPE_NONE" ...

am: 279f32ded5

Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962

2017-07-05 14:33:35 +00:00

..

java

Merge "ConnectivityManager: allow usage of TYPE_NONE"

2017-07-05 14:33:35 +00:00

jni

Merge "Add boot profile support"

2017-07-01 03:32:41 +00:00

proto/android

Prune unused static libs and instant apps if space needed

2017-05-31 02:30:41 +00:00

res

Merge "Wakeup packet mark/mask configuration option"

2017-07-04 03:47:14 +00:00

tests

Clean up Predicate related code in android.test

2017-06-26 15:51:10 +01:00