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

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