| commit | b63de44c224b00e3186e8359c0a31b8d4c1e7f84 | [log] [tgz] |
|---|---|---|
| author | Jamie Gennis <jgennis@google.com> | Tue Nov 29 17:26:32 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 29 17:26:32 2011 -0800 |
| tree | c5838660faaab5c38bbe755113931c88c63c2acf | |
| parent | 7b7dde99cae1cff53e15699da4ce80c9bfee109a [diff] | |
| parent | e06a1748a48317adfb1bbe4ae4f49164cba03268 [diff] |
am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 * commit '6f1dd757cb158d17c76baeb170f7db2271802ef8': SurfaceMediaSource: use the vid enc usage bit