tree f919123e1047f4e827d7cc7dcb0990231dbc7e24
parent e987792861efa0f164a50fd049cebadee0c198ac
parent 780882de33d5e91596a31b17ae050d448dd01443
author TreeHugger Robot <treehugger-gerrit@google.com> 1503058325 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1503058325 +0000

Merge "Fix the calculation of the number of frames" into oc-mr1-dev