am 69e28c2f: (-s ours) am ce4de8d1: Merge "stagefright aacenc: Add parentheses...
am 69e28c2f: (-s ours) am ce4de8d1: Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||"
* commit '69e28c2f':
stagefright aacenc: Add parentheses in expression with mixed && and ||