Merge cherrypicks of ['googleplex-android-review.googlesource.com/23914022'] into udc-release.

Change-Id: I6efcaa493569babe8caec5630434486584f1c17a

media/mtp/MtpProperty.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,9 @@ namespace android {
		class MtpDataPacket;

		struct MtpPropertyValue {
		// pointer str initialized to NULL so that free operation
		// is not called for pre-assigned value
		MtpPropertyValue() : str (NULL) {}
		union {
		int8_t i8;
		uint8_t u8;