Commit 885500b0 authored Sep 03, 2024 by Treehugger Robot Committed by Automerger Merge Worker Sep 03, 2024

Merge "No need to std::move local variable to return value" into main am: 608316b4 am: 7db248a4

libs/androidfw/Asset.cpp

+2 −4

Original line number	Diff line number	Diff line
		@@ -309,9 +309,8 @@ Asset::Asset(void)
		return NULL;
		}

		// We succeeded, so relinquish control of dataMap
		pAsset->mAccessMode = mode;
		return std::move(pAsset);
		return pAsset;
		}

		/*
		@@ -328,9 +327,8 @@ Asset::Asset(void)
		return NULL;
		}

		// We succeeded, so relinquish control of dataMap
		pAsset->mAccessMode = mode;
		return std::move(pAsset);
		return pAsset;
		}

		/*