tree fa2f33aa0f6f1875dfe5faa2b980d90c96aa6d47
parent d0202e53900db6a07ff154c7b1e31b20c3942ad3
parent fd5aca8bb196e24b8b9c8189e2389f4f9087f804
author Dharmaray Kundargi <dharmaray@google.com> 1295335857 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295335857 -0800

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

* commit 'fd5aca8bb196e24b8b9c8189e2389f4f9087f804':
  add videoeditor libraries to make