tree 103fe345bec704c83538bc7cd251fac08d4b788b
parent 2a97508f750c669024b2f53dfb296099b416b0ab
parent 31f472caed0618ab2d15aa7b493fada2c0abf846
author Michael Chan <mchan@android.com> 1254962693 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254962693 -0700

am 31f472ca: am 9b168fae: b/2167301 Guests were dropped when creating an exception to a recurring event.

Merge commit '31f472caed0618ab2d15aa7b493fada2c0abf846' into eclair-mr2-plus-aosp

* commit '31f472caed0618ab2d15aa7b493fada2c0abf846':