tree 7ec6e8769cc9863a74e83f303d6b122172db4e0d
parent 3269b5314f02eb3724be8d45880f15762fac09c0
parent 96d18cca4546045df118660017e74ddd751dfbb4
author Jean-Baptiste Queru <jbq@google.com> 1344456675 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344456675 -0700

am 96d18cca: am 0822156c: Merge "avcenc: Fix indentation"

* commit '96d18cca4546045df118660017e74ddd751dfbb4':
  avcenc: Fix indentation