am df20ad8e: (-s ours) 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