| commit | 1a42aee5e1e975158da4754f9bae46c945e27281 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Aug 16 15:31:18 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 16 15:31:18 2012 -0700 |
| tree | a53726fd44407323ef9cb2adcb8913d78c4143c8 | |
| parent | 9bd763d1d3b7dcb30320aa70597680a53ffb5bbf [diff] | |
| parent | a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99 [diff] |
am a109e9d5: am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding inline assembly" * commit 'a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99': avcenc: Clarify the ifdefs surrounding inline assembly