tree b431db4c90f0916f7b30aaf14d417f60b5d072e0
parent 7dd1a24d77746be8d756804ca31737001af3c9b7
parent df20ad8efe6c045bf5655ab60dc0470701e80d7b
author Keun young Park <keunyoung@google.com> 1361485492 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361485492 -0800

am df20ad8e: am b7377cc8: (-s ours) am 6fb729dd: Merge "blacklist android.provider.cts.CalendarTest#testEventColors DO NOT MERGE" into jb-dev

* commit 'df20ad8efe6c045bf5655ab60dc0470701e80d7b':
  blacklist android.provider.cts.CalendarTest#testEventColors DO NOT MERGE