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

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