Commit 7b3e6660 authored Aug 04, 2020 by Treehugger Robot Committed by Automerger Merge Worker Aug 04, 2020

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

Merge "Update language to comply with Android's inclusive language guidance" am: f08b1330 am: 0490999d am: 4c727667 am: be236885 am: 7d52b480

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

Change-Id: I1772e22d210fe67f833b29385d258d748f49edf3

packages/FakeOemFeatures/src/com/android/fakeoemfeatures/FakeView.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import android.os.Message;
		import android.view.View;

		/**
		* Dummy view to emulate stuff an OEM may want to do.
		* Fake view to emulate stuff an OEM may want to do.
		*/
		public class FakeView extends View {
		static final long TICK_DELAY = 30*1000; // 30 seconds