Commits
Jean-Baptiste Queru authored and Android Git Automerger committed 357dbbf53eeM
am 4fe782d2: am 69e28c2f: (-s ours) am ce4de8d1: Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||" * commit '4fe782d2a247ca2c076996a2a4dbd10f13c3c56e': stagefright aacenc: Add parentheses in expression with mixed && and ||
Showing diff to92f4c7bc49f