James Mattis 2066a2dc84 Merge "Adding log history for setOemNetworkPreference()" am: 7fe91d40f1 am: 98b7cc58c6 am: 3842f94fe3 ...

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

Change-Id: I123342002b462567174960aa30d1bc4727a8cec7

2021-04-09 17:54:44 +00:00

..

common

Merge "Replace fields with getters in keepalive API" am: bc01e88edc am: 4c1a04c308 am: 2c5dcb4c03

2021-04-09 02:34:59 +00:00

integration

Merge changes Ib5cd2c27,I4448a354 into sc-dev

2021-04-01 09:02:15 +00:00

java

Merge "Adding log history for setOemNetworkPreference()" am: 7fe91d40f1 am: 98b7cc58c6 am: 3842f94fe3

2021-04-09 17:54:44 +00:00

res/raw

NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID

2020-05-28 02:44:20 -07:00

smoketest

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

2021-02-21 20:12:24 +00:00

Android.bp

Add framework-connectivity-test-defaults

2021-03-31 17:19:57 +08:00

jarjar-rules.txt

Address comments on aosp/1448415

2020-10-21 13:54:02 +09:00

TEST_MAPPING

frameworks: add test group for auto tests

2021-03-09 15:54:39 -08:00