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

..

android

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

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

com

Merge "Note network interfaces based on transport" am: 8334a265ad am: cd65235a77

2021-01-28 09:02:21 +00:00

org

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

Android.bp

…

jarjar-rules.txt

…

overview.html

…