Commit 4206d155 authored May 11, 2017 by Andreas Gampe Committed by android-build-merger May 11, 2017

Merge "Otapreopt: Work around bug 38186355" into oc-dev am: 4c8cc1c8

am: 0bcb8e93

Change-Id: I00677ec99337440037be6467486564213714bce5

cmds/installd/otapreopt.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -734,6 +734,10 @@ private:
		}

		static const char* ParseNull(const char* arg) {
		// b/38186355. Revert soon.
		if (strcmp(arg, "!null") == 0) {
		return nullptr;
		}
		return (strcmp(arg, "!") == 0) ? nullptr : arg;
		}