Robin Lee 56ba111947 Merge "Fix crash on TV caused by new iconFactory attrs" into rvc-dev am: 848cfed7df am: f6d1bc1b37 ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11734067

Change-Id: Ieebceb28ba42af88f0c16eef0fcaffa4fa0054f3

2020-06-05 16:44:10 +00:00

..

java

Merge "Cleanup outdated TODOs" into rvc-dev am: 6d410d8165 am: 0411d1d7e3

2020-06-05 16:27:07 +00:00

jni

Merge "Clean MTE and GWP-ASan runtime flags after use." into rvc-dev am: 1a7be751e1 am: 84ee80052c

2020-06-04 23:46:35 +00:00

proto

Merge "Wifi: Add definitions for 6GHz" into rvc-dev am: 7ccfc086e4 am: 4d8c041377

2020-06-03 21:40:39 +00:00

res

Merge "Fix crash on TV caused by new iconFactory attrs" into rvc-dev am: 848cfed7df am: f6d1bc1b37

2020-06-05 16:44:10 +00:00

tests

Merge "Add policies and enforce overlayable to header" into rvc-dev am: 2201f8b626 am: 1b4cda227a

2020-06-05 16:28:45 +00:00

xsd

Merge "Convert core/xsd/vts/Android.mk file to Android.bp" am: 682de55962 am: 6fc5f5e76e

2020-05-19 22:04:40 +00:00

TEST_MAPPING

…