tree 0c7f07428cf03a49f17cf8eea6ed6773c5becb3a
parent fac9b61a05e2143c877474ce3e2a3a47803ed799
parent 40be070922721b285a9436ec49e5d438ba322133
author James Dong <jdong@google.com> 1347902925 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347902925 -0700

am 40be0709: am dcd76da5: Merge "Make a small correction in terms of GOP structure in the recorded video" into jb-mr1-dev

* commit '40be070922721b285a9436ec49e5d438ba322133':
  Make a small correction in terms of GOP structure in the recorded video