| commit | 357dbbf53ee0bd8798dabb44a746c1ce688aa2ae | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 08 14:43:28 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 08 14:43:28 2012 -0700 |
| tree | 1f75930c25ab74aaf105f414e735863342541d00 | |
| parent | 92f4c7bc49f035bb2672356db5baf30b20240353 [diff] | |
| parent | 4fe782d2a247ca2c076996a2a4dbd10f13c3c56e [diff] |
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 ||