Zimuzo Ezeozue 4005dd8a79 resolve merge conflicts of 7df4e1c5a4 ...

resolve merge conflicts of
"Add API to notify the system_server when app is blocked on I/O"
to master

Change-Id: Ie7a7be2a5b8557a2cdd3fbc1a6a37622b29535be

2021-03-01 15:55:14 +00:00

..

Android.bp

[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

current.txt

Merge "Adding API to get PendingIntent to launch manageSpaceActivity"

2021-03-01 10:36:04 +00:00

module-lib-current.txt

Add API to notify the system_server when app is blocked on I/O

2021-03-01 10:36:16 +00:00

module-lib-removed.txt

…

OWNERS

Improve OWNERS coverage across frameworks/base/.

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

removed.txt

Split out the connectivity API surface

2021-02-25 11:01:24 +09:00

system-current.txt

Merge "Update the UCE OPTIONS API" am: a2d03f9eec am: 2f9c50d50a am: ee8b27d293 am: dcba4e14a9

2021-03-01 08:16:56 +00:00

system-lint-baseline.txt

SmartspaceManager initial implementation

2021-02-01 21:39:07 +00:00

system-removed.txt

…

test-current.txt

Merge "Added some testAPIs in ContentSuggestionsManager" into sc-dev

2021-03-01 12:06:19 +00:00

test-lint-baseline.txt

Exposed some testAPIs in UserManager

2021-02-26 10:08:18 +00:00

test-removed.txt

…