| commit | e249d15c590541d1333775fbcb27da3fde96b27c | [log] [tgz] |
|---|---|---|
| author | Keun young Park <keunyoung@google.com> | Tue Mar 05 21:12:33 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 21:12:33 2013 +0000 |
| tree | c34a0d4fb915baa2c27fded63398f68bc6a7aeab | |
| parent | c9245851cc8aee5eb7d8d0625900a726526f8cdc [diff] | |
| parent | 90fbae512cd8715a5a5dd0e514646d6e40e12b39 [diff] |
am 90fbae51: am 0433d84b: 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 '90fbae512cd8715a5a5dd0e514646d6e40e12b39':