tree bf6470ab0f985b10c66814f3f7a83e053de43a4d
parent e85658ea34ebebd631e8d1ced466188a64f24723
parent 128cbf2812ffc9391b20be7ef6a6fa9ca7872a91
author Andreas Huber <andih@google.com> 1271106994 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1271106994 -0700

Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice." into froyo