tree 1729da3d544c2429961cd734c5cfba5f750ca33f
parent 4714b0766ecf48f09f39b4781a5c4deafc092d49
parent 4999e983c8f2f0060c14f2d7c5488e7f553985b4
author James Dong <jdong@google.com> 1279044267 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279044267 -0700

am f6bdc764: am 9d8bea11: Merge "Initial checkin for software AVC encoder" into gingerbread

Merge commit 'f6bdc764b7a21f8037504e1dc4f81227ea2bedea'

* commit 'f6bdc764b7a21f8037504e1dc4f81227ea2bedea':
  Initial checkin for software AVC encoder