tree 4c101d6a976e944dccb42758add7e753451ad41e
parent 96d4f4a52e7e5195e5a70c8b6ce1121a2729bfc1
parent caf74f7732bcea4fb1a574fe01d93dcf80423cea
author Marco Nelissen <marcone@google.com> 1449691586 +0000
committer android-build-merger <android-build-merger@google.com> 1449691586 +0000

Merge "Fix overflows in amrwbenc" am: bcd54f426f
am: caf74f7732

* commit 'caf74f7732bcea4fb1a574fe01d93dcf80423cea':
  Fix overflows in amrwbenc