tree cdd3e0bd67ae72815e5165e6867dc28c7bc626d5
parent 32f212ead657617df00c948448680b7ff7d11146
parent 1c1b5e51cb1acd43984ce2e82a27e61b4943186a
author Narayan Kamath <narayan@google.com> 1404909403 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404909403 +0000

am 1c1b5e51: am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"

* commit '1c1b5e51cb1acd43984ce2e82a27e61b4943186a':
  m4v_h263_enc: Use uint32_t for ULong