fionaxu 907f3cd76b Merge "add install action for carrier id to system API" into pi-dev ...

am: 689866352b

Change-Id: I472e17218bfe5bcb3178ff6da87910812b17a4dc

2018-05-09 16:08:26 -07:00

..

java

Merge "add install action for carrier id to system API" into pi-dev

2018-05-09 16:08:26 -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 "add install action for carrier id to system API" into pi-dev

2018-05-09 16:08:26 -07:00

tests

Merge "Allow only selected priv apps to run OOB" into pi-dev

2018-05-09 12:37:38 -07:00