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

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