Commit 1e357f46 authored Aug 08, 2012 by Jean-Baptiste Queru Committed by Android Git Automerger Aug 08, 2012

am ef620093: am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."

* commit 'ef620093':
  Correct ID3::StringSize calculation for UCS-2 data.

media/libstagefright/id3/ID3.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -743,7 +743,8 @@ static size_t StringSize(const uint8_t *start, uint8_t encoding) {
		n += 2;
		}

		return n;
		// Add size of null termination.
		return n + 2;
		}

		const void *