| commit | 90fbae512cd8715a5a5dd0e514646d6e40e12b39 | [log] [tgz] |
|---|---|---|
| author | Keun young Park <keunyoung@google.com> | Tue Mar 05 13:09:33 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 13:09:33 2013 -0800 |
| tree | dfca3d8959e95208aa4230a06de83035f425d064 | |
| parent | 84c373d7a9a419412cd0b0231e18190c2d956c78 [diff] | |
| parent | 0433d84b693769f1042cd83e3bcf6b7d45e79067 [diff] |
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 '0433d84b693769f1042cd83e3bcf6b7d45e79067':