Patrick Baumann 896935a5f8 Merge "Expands javadocs for Intent.FLAG_ACTIVITY_MATCH_EXTERNAL" into pi-dev ...

am: a1e56fb23b

Change-Id: I85e00cf89c6259c207976e99f3e7cbf074a42001

2018-05-10 11:36:09 -07:00

..

java

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

2018-05-10 11:36:09 -07:00

jni

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

2018-05-09 15:59:50 -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

2018-05-10 04:48:29 -07:00

tests

Merge "Further flesh out app ops foreground state." into pi-dev

2018-05-09 22:59:34 -07:00