vadimt c708384087 resolve merge conflicts of a24ed7267c to ub-launcher3-qt-future-dev ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I89f3bcf309b10a359b12167474fcb3f93640787f

2019-09-17 13:03:18 -07:00

..

dummy_app

System apps must target API 28 or higher

2019-01-03 12:57:33 -08:00

res

Enabling tests for pausing apps

2019-05-29 12:07:55 -07:00

src/com/android/launcher3

Key by both package and user for list of active install sessions.

2019-09-17 12:00:03 -07:00

tapl

Merge "Support for tests that a leak is detected" into ub-launcher3-qt-qpr1-dev

2019-09-17 19:16:00 +00:00

Android.mk

Build rule cleanup

2019-08-08 02:02:20 -07:00

AndroidManifest-common.xml

Adding system health permissions to Launcher3 tests

2019-08-05 17:31:53 -07:00

AndroidManifest.xml

Changing min sdk to 25

2019-01-29 11:29:52 -08:00

OWNERS

Extending the list of test owners

2019-08-14 17:18:45 -07:00