Lucas Lin dca35b322f Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e am: cf985cf03e am: 24b2a334d0 ...

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75c940363940f4c941cc7dc89452bed078396a7e

2021-03-02 19:55:02 +00:00

..

common

Merge changes I06ab0f2d,I8b146aa1

2021-03-02 04:13:32 +00:00

integration

Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8

2021-03-02 04:07:35 +00:00

java

Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3 am: 25d2ee9e66 am: de7ef4ab0b

2021-03-02 19:54:22 +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

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

jarjar-rules.txt

Address comments on aosp/1448415

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

TEST_MAPPING

Add imports to networking test mapping

2020-10-15 09:16:40 +00:00