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

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base