commit | 1d28e621ea4588c1fa4967f8afca78a7c8005bb5 | [log] [tgz] |
---|---|---|
author | Keun young Park <keunyoung@google.com> | Thu Feb 21 15:20:11 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 21 15:20:11 2013 -0800 |
tree | 3433fd37064c1919c47d6c0916c39b84b40a31c7 | |
parent | e3a2b8646a5a80f85373025f2a61bdba14ff3ad5 [diff] | |
parent | 1e27876715f5e08d578f67e2c783d8ee47962590 [diff] |
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