fionaxu 2bbb36cb4f Merge "add install action for carrier id to system API" ...

am: 87a7c657bd

Change-Id: I5a3534bc791b44be092bfae2c07b2415886e4ed8

2018-05-11 11:52:27 -07:00

..

java

Merge "add install action for carrier id to system API"

2018-05-11 11:52:27 -07:00

jni

Merge "Process "dalvik.vm.profilebootimage" system property"

2018-05-09 01:55:51 +00:00

proto/android

Bluetooth: Separate enable and disable Reasons from package name

2018-03-08 01:38:48 +00:00

res

Merge "add install action for carrier id to system API"

2018-05-11 17:36:24 +00:00

tests

Merge "Fix android.net.SSLTest"

2018-05-09 18:35:47 -07:00