Tracy Zhou 6699858d49 resolve merge conflicts of 5d065997f8 to master ...

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

2020-05-29 19:38:36 -07:00

..

dummy_app

System apps must target API 29 or higher

2019-11-06 16:01:25 -08:00

res

Merging ub-launcher3-master, build 5945220

2019-10-16 22:46:01 -07:00

src/com/android/launcher3

Merge "Abstracting out state handler logic into base classes so that it can also be used in different activity" into ub-launcher3-rvc-dev

2020-05-12 00:29:52 +00:00

src_common

Adding common code for instrumentation and robolectric tests

2020-04-20 14:42:30 -07:00

tapl

resolve merge conflicts of 5d065997f8 to master

2020-05-29 19:38:36 -07:00

Android.mk

Adding common code for instrumentation and robolectric tests

2020-04-20 14:42:30 -07:00

AndroidManifest-common.xml

Using grantRuntimePermission()

2020-01-08 12:01:34 -08:00

AndroidManifest.xml

System apps must target API 29 or higher

2019-11-06 16:01:25 -08:00

OWNERS

Extending the list of test owners

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