Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Thu, 11 Nov 2010 14:22:46 +0000 (09:22 -0500)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 11 Nov 2010 14:22:46 +0000 (09:22 -0500)
commit1ea4c2924c6595a542713bbf115965b6e8ddabfe
tree5912d55c4ff61554879ce3ef044fc33d33e793ae
parent9857ebce96e9c4d92b961f676f68ae681ab8efa2
parent692b10858d8be54706f3e02ba3075c9718d7d683
Merge remote branch 'internal/upstream' into HEAD

Conflicts:
configure

Change-Id: I1c7bae5241f999387cae3f2abf2dfc84fe3f6651
configure
vp8/vp8_cx_iface.c