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

Browse Source

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

...

This commit is contained in:

Jean-Baptiste Queru

2012-06-08 14:34:28 -07:00

committed by Android Git Automerger

parent 3a3c7e7bc4 69e28c2ff7

commit 4fe782d2a2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available