Colin Cross 8fae3c8472 resolve merge conflicts of 4cbab13de1 to rvc-dev-plus-aosp ...

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

2020-06-12 17:46:50 -07:00

..

check_boot_jars.py

Use inclusive language in build/make

2020-06-11 14:37:54 -07:00

package_allowed_list.txt

resolve merge conflicts of 4cbab13de1 to rvc-dev-plus-aosp

2020-06-12 17:46:50 -07:00