| commit | 21e13d9c7de1c2853eed5d35a74955e1865abfa4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 11 14:29:22 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 11 14:29:22 2012 -0700 |
| tree | 5ab9d6dcfa3816a64ffd5ba5885343f38bc0416e | |
| parent | 6e85ad7d267f47ba3a367651a70d147725dc26ae [diff] | |
| parent | 237fa1901fee9617e5e8073470bd4fb7a224541f [diff] |
am 237fa190: (-s ours) am 68ecb32e: Merge "stagefright aacenc: Move system headers before local headers" * commit '237fa1901fee9617e5e8073470bd4fb7a224541f': stagefright aacenc: Move system headers before local headers