tree 22776b3d1aa5197f135dc3003e79ec730b822da9
parent 57d431e928fbf9419fc7b0d87c34aa8472ae0d11
parent 9b168fae95ff394c3116bfdf61af3ccb2c4c3e34
author Michael Chan <mchan@android.com> 1254962369 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254962369 -0700

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

Merge commit '9b168fae95ff394c3116bfdf61af3ccb2c4c3e34' into eclair-mr2

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