Jakub Pawlowski 7cd99c47bb resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp ...

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

2021-01-31 00:40:24 +01:00

..

api

Merge "Introduce global package hibernation"

2021-01-30 00:37:19 +00:00

java

resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp

2021-01-31 00:40:24 +01:00

jni

Merge "audio: add implementation for TV related API" am: f57ff9e7e5 am: 3caa10c625

2021-01-28 18:33:50 +00:00

proto

Addition of OWNERS / initial .proto file

2021-01-07 15:52:12 +00:00

res

Merge "Add setup usage for ACCESS_KEYGUARD_SECURE_STORAGE." am: 6131ca7d2f am: 3a91a2fdc2

2021-01-30 02:01:04 +00:00

sysprop

Watchdog: Rename properties to follow guidelines

2021-01-27 21:57:53 +08:00

tests

Merge "Introduce OWNERS file for Display unit tests"

2021-01-29 11:33:30 +00:00

xsd

…

TEST_MAPPING

…