tree 10fbed746f00a90b2911c3437734d7345d4e6f7d
parent dab48426d9b2becf45bef409f607045f066d6f72
parent 391906630443d7bd1d3a34e34535d93113723316
author Jean-Baptiste Queru <jbq@google.com> 1330108385 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330108385 -0800

am 78fc0c0b: am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74

* commit '78fc0c0bfae913a4a44011225396ae525b335fb1':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit