tree 71a66aa8a9a760086aba831e07101474dede90e2
parent b72a335a7f11176838d2d12e7295344c092c62ac
parent b699726018a0049665d8ad6b90dbc5af0e18f135
author Jeff Brown <jeffbrown@google.com> 1286747277 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1286747277 -0700

Merge "Added more robust tracking and cancelation of events." into gingerbread