am b9619430: (-s ours) Merge "Actually 59 fps DO NOT MERGE" into ics-mr0

* commit 'b96194308dc8678e99564f038872061e4881e65a':
  Actually 59 fps DO NOT MERGE