Commit 51ded686 authored Aug 12, 2020 by Chun-Wei Wang Committed by Automerger Merge Worker Aug 12, 2020

Merge "Update language to comply with Android's inclusive language guidance" am: a5d1ef98

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397950

Change-Id: I87ef70146b5032409b8d6f87932641fa620add01

tests/RollbackTest/README.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -9,10 +9,10 @@ StagedRollbackTest
		- device driven test for staged rollbacks.

		TestApp
		- source for dummy apks used in testing.
		- source for fake apks used in testing.

		TestApex
		- source for dummy apex modules used in testing.
		- source for fake apex modules used in testing.

		Running the tests
		=================