David Brazdil 9ad1461eb9 Merge "Annotate two non-SDK methods known to be used by apps" am: de441278e7 am: 32d2f8fe46 ...

am: a5083783f7

Change-Id: I59f5f3ea5a0424036e1e715e56d8fa16572358b1

2018-12-20 06:09:41 -08:00

..

java

Merge "Annotate two non-SDK methods known to be used by apps" am: de441278e7 am: 32d2f8fe46

2018-12-20 06:09:41 -08:00

jni

Merge "Use ICU in libandroidicu" am: 995c3f5247 am: 664e409040

2018-12-20 04:19:44 -08:00

proto

Merge "Add package information to association sources."

2018-12-18 23:58:33 +00:00

res

Merge "Add secondary launcher mechanism (1/3)"

2018-12-20 00:28:58 +00:00

tests

Merge "Migrate frameworks/base/core/tests/overlaytests/host/test-apps/UpdateOverlay to androidx.test"

2018-12-19 14:53:17 +00:00