tree 5cbeb9df2fb2ad8e20fa511518b9c5e2ce2ca806
parent 10651e7b4f209a03649b9eac62facbc7bf864d17
parent f98ed2e5c5e08cac159ce4cf22ab86a718f0bb0b
author Michael Chan <mchan@android.com> 1344532655 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344532655 -0700

am f98ed2e5: Fixed the problem where updating event colors would cause exceptions

* commit 'f98ed2e5c5e08cac159ce4cf22ab86a718f0bb0b':
  Fixed the problem where updating event colors would cause exceptions