| commit | 0433d84b693769f1042cd83e3bcf6b7d45e79067 | [log] [tgz] |
|---|---|---|
| author | Keun young Park <keunyoung@google.com> | Tue Mar 05 13:02:32 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 13:02:32 2013 -0800 |
| tree | 01cac341e28f9264abf9d4e89a318abcac6b9d72 | |
| parent | 2b2a4312857966ffa6a70204346c754457eaf757 [diff] | |
| parent | 141f40ec900352901d99b2895c16e91d8bdaa080 [diff] |
am 141f40ec: (-s ours) am df20ad8e: (-s ours) am b7377cc8: (-s ours) am 6fb729dd: Merge "blacklist android.provider.cts.CalendarTest#testEventColors DO NOT MERGE" into jb-dev * commit '141f40ec900352901d99b2895c16e91d8bdaa080':