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

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

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

* commit 'df20ad8e':
  blacklist android.provider.cts.CalendarTest#testEventColors DO NOT MERGE
parents c21e39c2 df20ad8e
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