Mathew Inwood 1819ed49f5 resolve merge conflicts of a07e6debf0 to master ...

Test: m
Bug: None

Change-Id: I895c1e86e49b3dc97cf0be1d0a975774fbc11ed3

2021-01-14 13:20:14 +00:00

..

Android.bp

profman: inclusive language updates

2020-08-17 15:35:31 +01:00

boot-image-profile.txt

Update boot image and system server profiles [M10C10P10S0PP]

2020-11-18 00:23:52 +00:00

boot-profile.txt

…

copyright-header

…

dirty-image-objects

…

generate-preloaded-classes.sh

profman: inclusive language updates

2020-08-17 15:35:31 +01:00

hiddenapi-force-blocked.txt

Rename manual hidden api lists

2020-08-04 15:02:24 +01:00

hiddenapi-max-target-o.txt

Fix DecoratedCustomViewStyle

2020-11-17 14:38:14 -05:00

hiddenapi-max-target-p.txt

Rename manual hidden api lists

2020-08-04 15:02:24 +01:00

hiddenapi-max-target-q.txt

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

2020-08-31 21:21:38 -07:00

hiddenapi-max-target-r-loprio.txt

resolve merge conflicts of a07e6debf0 to master

2021-01-14 13:20:14 +00:00

hiddenapi-unsupported-packages.txt

Rename manual hidden api lists

2020-08-04 15:02:24 +01:00

hiddenapi-unsupported.txt

Copy LocationProviderBase API into SystemApi surface

2021-01-08 10:33:44 -08:00

OWNERS

Improve OWNERS coverage across frameworks/base/.

2020-12-08 08:36:28 -07:00

preloaded-classes

Introduce device(s) role for strategy.

2020-12-21 17:01:20 +01:00

preloaded-classes-denylist

Update boot image and system server profiles [M10C10P10S0PP]

2020-11-18 00:23:52 +00:00

preloaded-classes-extra

…

TEST_MAPPING

…