tree 3433fd37064c1919c47d6c0916c39b84b40a31c7
parent e3a2b8646a5a80f85373025f2a61bdba14ff3ad5
parent 1e27876715f5e08d578f67e2c783d8ee47962590
author Keun young Park <keunyoung@google.com> 1361488811 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361488811 -0800

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