Brett Chabot a501875e0d Resolve merge conflicts of c2810b9385 to sc-qpr1-dev-plus-aosp ...

Test: treehugger
Bug: 205015919

Merged-In: I93c21e680382e03342f235dbf58bd7a5c8a6f767
Merged-In: I83d9ab4a15a862ea220debdd8da8b3d5673da276
Merged-In: Ibdff22eda7be6c91e2872e5ac3ae8f2fe1e65b69
Change-Id: I33556062a3798fcd86a620c11622fc97f8610768

2021-11-04 17:52:05 +00:00

..

java

Resolve merge conflicts of c2810b9385 to sc-qpr1-dev-plus-aosp

2021-11-04 17:52:05 +00:00

proto

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

OWNERS

Fix OWNERS for graphics

2021-01-05 16:05:50 -05:00

TEST_MAPPING

…