tree e4e4b28811de35de64acbe455b0bef4cbd6a71b9
parent 5126a88c0e3be9c95325a53116ecbf88e794099e
parent e5dec5b51b25624462d00bd8e07f405493e8f059
author Lajos Molnar <lajos@google.com> 1498786499 +0000
committer android-build-merger <android-build-merger@google.com> 1498786499 +0000

Merge "Further increase framerate limits" into oc-dev
am: e5dec5b51b

Change-Id: I0d7c703371f182f282b66ed68df749a8813ba75b