Aaron Huang 5b03885d43 Merge "Create service-connectivity.jar" am: bfceacea50 am: b91257f553 ...

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351252

Change-Id: Ic068be012bee6d8b1cd7b974896da9750e6ca453

2020-10-20 19:42:46 +00:00

..

java

Merge "Create service-connectivity.jar" am: bfceacea50 am: b91257f553

2020-10-20 19:42:46 +00:00

jni

Merge "Fix trivial typo in the log message" am: 2a24bd3071

2020-10-19 16:00:31 +00:00

proto

Merge ab/6749736 in stage.

2020-10-10 20:38:57 -07:00

res

Merge changes from topic "new-ipsec-api" am: a80fb3bbe6 am: cb5aed6518

2020-10-16 23:07:31 +00:00

sysprop

Update API of sysprop_library to match current.txt

2020-10-15 10:38:48 +00:00

tests

[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Revert "Require permission to create trusted displays"" am: c947b10f99 am: 1e0cf0c900

2020-10-16 18:56:25 +00:00

xsd

Remove vts10 related configs

2020-10-05 11:04:45 -07:00

TEST_MAPPING

…