Julia Reynolds 28bbd2256b Merge "Add method for Settings" into rvc-dev am: 829ac140f8 ...

Change-Id: I7ca30e8641733595a050c3fe4056f45d43c0d60e

2020-05-31 19:08:24 +00:00

..

java

Merge "Add method for Settings" into rvc-dev am: 829ac140f8

2020-05-31 19:08:24 +00:00

jni

Merge "Add dnsproxyd_protocol_headers for NETID_USE_LOCAL_NAMESERVERS" into rvc-dev am: 351fb18fa4

2020-05-29 14:09:22 +00:00

proto

…

res

Import translations. DO NOT MERGE

2020-05-30 18:47:56 +00:00

tests

Merge "Fix get display from display context derived context not working" into rvc-dev am: 13e3568567

2020-05-30 06:51:40 +00:00

xsd

…

TEST_MAPPING

…