tree ad7114452d29b08e8267d77a6a3737df77bb22bf
parent 1abd149af93bf4911dff29200f1c5931c73950fa
parent 9b168fae95ff394c3116bfdf61af3ccb2c4c3e34
author Michael Chan <mchan@android.com> 1254962488 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254962488 -0700

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

Merge commit '9b168fae95ff394c3116bfdf61af3ccb2c4c3e34' into eclair-plus-aosp

* commit '9b168fae95ff394c3116bfdf61af3ccb2c4c3e34':
  b/2167301 Guests were dropped when creating an exception to a recurring event.