Commit 4b52d503 authored Jul 31, 2020 by Treehugger Robot Committed by Automerger Merge Worker Jul 31, 2020

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

Merge "Update language to comply with Android's inclusive language guidance" am: 98973ea7 am: 9d67d595 am: 724c8773 am: bd8aa1fe

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

Change-Id: I60dac6b53f4fedacb91962b0b7192ae48858347b

core/java/android/app/backup/BackupAgent.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -919,7 +919,7 @@ public abstract class BackupAgent extends ContextWrapper {

		/**
		* Only specialized platform agents should overload this entry point to support
		* restores to crazy non-app locations.
		* restores to non-app locations.
		* @hide
		*/
		protected void onRestoreFile(ParcelFileDescriptor data, long size,