Commit 8ae1d6e1 authored Aug 23, 2023 by Treehugger Robot Committed by Automerger Merge Worker Aug 23, 2023

Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" into main am: 1b4b8990 am: f85f0e6b am: 8781f3f4

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

Change-Id: I67dcdbd7a24d54fe602995cc7d1b3ecfc2232673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -674,7 +674,7 @@ public class AppLaunch extends InstrumentationTestCase {
		return true;
		}

		// iorap compiler filters specified: the compilerFilter must be in the whitelist.
		// iorap compiler filters specified: the compilerFilter must be in the allowlist.
		if (mIorapCompilerFilters.indexOf(compilerFilter) != -1) {
		return true;
		}