[automerger] Merge changes from topic...

[automerger] Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into cw-f-dev am: 24125176 am: a797cdf2

Change-Id: I4eac853adab76646987b4787700a18fb1d6b7f68

parents 13fcec1c a797cdf2

media/libstagefright/foundation/base64.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -78,8 +78,7 @@ sp<ABuffer> decodeBase64(const AString &s) {
		accum = (accum << 6) \| value;

		if (((i + 1) % 4) == 0) {
		out[j++] = (accum >> 16);

		if (j < outLen) { out[j++] = (accum >> 16); }
		if (j < outLen) { out[j++] = (accum >> 8) & 0xff; }
		if (j < outLen) { out[j++] = accum & 0xff; }