Yifan Hong c6bf3d0b7d Merge "VintfObjectTest: fix test with respect to deprecation schedule changes" into pi-dev am: 34d5ae5e74 ...

am: 2ca3f24830

Change-Id: Idafb6edc0095dddf5bf6f3988642c6bee3e88122

2018-05-10 15:44:50 -07:00

..

java

Merge "Expands javadocs for Intent.FLAG_ACTIVITY_MATCH_EXTERNAL" into pi-dev am: a1e56fb23b

2018-05-10 15:10:49 -07:00

jni

Merge "Allow ImageDecoder to read SkFILEStream directly" into pi-dev am: b9790fd184

2018-05-09 16:10:22 -07:00

proto

Merge "Show "in parole?" in dumpsys jobscheduler" into pi-dev

2018-05-08 18:09:56 +00:00

res

Merge "Fix colorized messaging layout and smart replies." into pi-dev am: a1aafd7718

2018-05-10 04:57:52 -07:00

tests

Merge "VintfObjectTest: fix test with respect to deprecation schedule changes" into pi-dev am: 34d5ae5e74

2018-05-10 15:44:50 -07:00