Commit 0c39e52f authored Jun 08, 2016 by Marco Nelissen Committed by android-build-merger Jun 08, 2016

Merge \\"Fix undefined behavior\\" am: fbd40d66

am: a636873d

Change-Id: Ie90ec8966692afc211977d51eb197b1b3fc766b4

media/libstagefright/codecs/amrwbenc/inc/basic_op.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -765,7 +765,7 @@ static_vo Word32 L_shl2(Word32 L_var1, Word16 var2)
		break;
		}
		}
		L_var1 <<=1 ;
		L_var1 *= 2 ;
		L_var_out = L_var1;
		}
		return (L_var_out);