tree 4849bd7bf427272eb6c60fafb0ac6cdd2a0baf8f
parent 63dd4c65c41187967ba0828d386117f90020840e
parent ce4de8d141386ade1f184aa1b56fff7d3097dc3f
author Jean-Baptiste Queru <jbq@google.com> 1339190357 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339190357 -0700

am ce4de8d1: Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||"

* commit 'ce4de8d141386ade1f184aa1b56fff7d3097dc3f':
  stagefright aacenc: Add parentheses in expression with mixed && and ||