tree cd3744aae62ed70b5998e8d31d054c0f5a9209cd
parent 97081d6485b45ded3759f6c54c9b9b58eaff24fe
parent 6e987f990395453b3ece9a055d73a07630413b6e
author Lajos Molnar <lajos@google.com> 1498787448 +0000
committer android-build-merger <android-build-merger@google.com> 1498787448 +0000

Merge "Merge "Further increase framerate limits" into oc-dev am: d8f2c2b46c am: 91d3f41261" into oc-dr1-dev-plus-aosp
am: 6e987f9903

Change-Id: I91ae1ebbbd4ec63ffd4b5e7d08cd54d52c259db4