Stanislav Zholnin 9e3a623fac resolve merge conflicts of 25a656d916 to master ...

Change-Id: Ie6353043b4abcaccea368a0ee961f65f12ec397c

2020-05-25 20:46:02 +00:00

..

java

resolve merge conflicts of 25a656d916 to master

2020-05-25 20:46:02 +00:00

jni

Merge "Check property for sdcardfs use" into rvc-dev am: 3f15f4018e am: 5e780a0945 am: 5f0cbaaed5 am: a3824daa14

2020-05-21 09:18:27 +00:00

proto

Merge "Add data collection and metrics for Media Output Switcher - 1/n" into rvc-dev am: 82c49a95cd am: e865d4e77a am: 001e79876e am: 44ffc4366c

2020-05-21 16:20:48 +00:00

res

Merge "Add the NOT_SUSPENDED capability to Ethernet - doc part" into rvc-dev am: a31117d668 am: c677f1c9f7

2020-05-25 06:54:12 +00:00

tests

Merge "Move IndentingPrintWriter to android.util"

2020-05-21 21:17:07 +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

…