tree 182c0fb5ce424f629aee845516aa88457fbd9023
parent 8a50328131307b53ebde95e9af87a408c4011559
parent bb1543bd8596700ab12a5968e73a9794e26fd4de
author Ronghua Wu <ronghuawu@google.com> 1438625221 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1438625221 +0000

Merge "Encoder: Fixed an issue in handling FPS greater than 60" into mnc-dev