tree 8821c268a79f4284075766aaab23ac296bfd3e37
parent 665aefdd2a47abe7abff61a83e78a2e4470ca004
parent c86bcf5f16b4c74139c67b742539222e3b290889
author Dharmaray Kundargi <dharmaray@google.com> 1295312204 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295312204 -0800

am c86bcf5f: Merge "add videoeditor libraries to make" into honeycomb

* commit 'c86bcf5f16b4c74139c67b742539222e3b290889':
  add videoeditor libraries to make