tree 05a2628b93f509323c722bf244c99ccdaa0ca874
parent bceb306ab61aed1bbff14c6521ab512836bcaa4b
parent cd3ed11664d16939f1f5763a896d7fc75dd3642e
author Jean-Baptiste Queru <jbq@google.com> 1345569493 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345569493 -0700

am cd3ed116: am 8d4d590d: am 1e75e972: Merge "avcenc: Update a comment about the inline assembly"

* commit 'cd3ed11664d16939f1f5763a896d7fc75dd3642e':
  avcenc: Update a comment about the inline assembly