Yifan Hong 90a5fd0549 Merge "Log errors on android.os.VintfObject.verify()" ...

am: 54b1e9c57c

Change-Id: I07f9797bcf9a32a3c9b517741e7cbef17d5a5382

2017-07-06 20:21:51 +00:00

..

java

Merge "Fix ContentObserver unregister issue"

2017-07-06 18:21:54 +00:00

jni

Merge "Log errors on android.os.VintfObject.verify()"

2017-07-06 20:21:51 +00:00

proto/android

Prune unused static libs and instant apps if space needed

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

res

Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"

2017-07-06 01:45:13 +00:00

tests

Clean up Predicate related code in android.test

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