Commit 740bc012 authored Dec 15, 2016 by Charles He Committed by android-build-merger Dec 15, 2016

Merge "[nit] Fix typo in properties.h" am: ded663c2 am: 21181e52 am: d8871020

am: 551a396b

Change-Id: I9b750104ab4615c5a3ea16c822d98e54dcd6bb14

base/include/android-base/properties.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,4 +61,4 @@ bool SetProperty(const std::string& key, const std::string& value);
		} // namespace base
		} // namespace android

		#endif // ANDROID_BASE_MEMORY_H
		#endif // ANDROID_BASE_PROPERTIES_H