Android 4.1 CTS release 2
Merge "blacklist android.provider.cts.CalendarTest#testEventColors DO NOT MERGE" into jb-dev