Vladimir Marko cce3bb5244 resolve merge conflicts of 6f0d5e0d1b to sc-dev ...

Test: N/A
Bug: None
Change-Id: I88560c8b73cff8b5dab5f0d53af026651e8952d0

2021-02-26 17:04:21 +00:00

..

android

resolve merge conflicts of 6f0d5e0d1b to sc-dev

2021-02-26 17:04:21 +00:00

com

Merge "Fix synchronisation in BackgroundBlurDrawable" into sc-dev

2021-02-26 14:30:04 +00:00

org

…

Android.bp

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

jarjar-rules.txt

…

overview.html

…