bd5662a1
Merge commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315' into eclair-mr2-plus-aosp * commit 'bd5662a1a2e74f1be1e0a0fb4858835caf10c315': add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
d301c904
88f2acb0