| commit | 4fe782d2a247ca2c076996a2a4dbd10f13c3c56e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 08 14:34:28 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 08 14:34:28 2012 -0700 |
| tree | 84d266d0090e6d85fcf469e686a40dd9b35fd91c | |
| parent | 3a3c7e7bc4f599c35f5ed4feeead15c6c5a4621f [diff] | |
| parent | 69e28c2ff7b46a05bf5b60cae59dbaf86ad2ad7f [diff] |
am 69e28c2f: (-s ours) am ce4de8d1: Merge "stagefright aacenc: Add parentheses in expression with mixed && and ||" * commit '69e28c2ff7b46a05bf5b60cae59dbaf86ad2ad7f': stagefright aacenc: Add parentheses in expression with mixed && and ||