tree 190fc4a509ff3c028fcb50a6e1349bac95eafda0
parent 8ada263469ed0d08b59bf0b4ffec0456ad3f8adb
parent 3e2b11ba0c0bec11e2d624e1cab43ce2fb567d80
author Lajos Molnar <lajos@google.com> 1379356523 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379356523 -0700

am 3e2b11ba: Merge "VideoEncoderDecoderTest fix maximum calculation" into klp-dev

* commit '3e2b11ba0c0bec11e2d624e1cab43ce2fb567d80':
  VideoEncoderDecoderTest fix maximum calculation