Merge "Merge "Remove String16 operator<<, now provided in header" am:...

Merge "Merge "Remove String16 operator<<, now provided in header" am: 35d04c27 am: f1e69505" into qt-qpr1-dev-plus-aosp am: 2593e104

Change-Id: I5cc3034b3d8ad29a3244ab436325f1f6a5cf243c

parents ebf6810c 2593e104

libs/androidfw/tests/CommonHelpers.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -44,10 +44,6 @@ static inline ::std::ostream& operator<<(::std::ostream& out, const String8& str
		return out << str.string();
		}

		static inline ::std::ostream& operator<<(::std::ostream& out, const String16& str) {
		return out << String8(str).string();
		}

		static inline ::std::ostream& operator<<(::std::ostream& out, const ResTable_config& c) {
		return out << c.toString();
		}