Roshan Pius 39ff19da2f resolve merge conflicts of d2c4f1d6c8 to stage-aosp-master ...

Merged-In: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3
Change-Id: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3

2021-03-21 19:20:35 +00:00

..

common

resolve merge conflicts of d2c4f1d6c8 to stage-aosp-master

2021-03-21 19:20:35 +00:00

integration

Merge changes from topics "revert-1645768-revert-1626206-replaceUidRange-MSYTKFNGUE-HIUTVTIGIR", "ti_redaction"

2021-03-21 16:41:13 +00:00

java

resolve merge conflicts of d2c4f1d6c8 to stage-aosp-master

2021-03-21 19:20:35 +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-16 04:09:57 -08:00

Android.bp

Merge "Create ServiceConnectivityResources"

2021-03-16 02:29:31 +00: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