Commit df20ad8e authored by Keun young Park's avatar Keun young Park Committed by Android Git Automerger
Browse files

am b7377cc8: (-s ours) am 6fb729dd: Merge "blacklist... 

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

* commit 'b7377cc8':
  blacklist android.provider.cts.CalendarTest#testEventColors DO NOT MERGE
parents 00c0a0c3 b7377cc8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment