tree 29e251e6ba7f82ca074e6d0faa971dca7680273c
parent 4c8b4a15d81bc8847ede41b96cf46925b8d938b7
parent 15cb58b4bbc2a53c059ae2ef844ec5a30d39306d
author Lajos Molnar <lajos@google.com> 1498787040 +0000
committer android-build-merger <android-build-merger@google.com> 1498787040 +0000

Merge "Further increase framerate limits" into oc-dev am: d8f2c2b46c
am: 15cb58b4bb

Change-Id: I6d010c60a8516c36d81e70a6537c6e811c0ef179