tree a14464123bebfff64910d7c44b1759a699a6caa8
parent a6966d33daf0c449d3ad0beabc5850c8bf7b19f7
parent ddd5680e8fac9661f1141c3acd60d0207ff38cc0
author Rebecca Schultz Zavin <rebecca@android.com> 1299206584 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1299206584 -0800

Merge "set max_events_per_sec to 55" into honeycomb-mr1