| commit | 425645c738f200b44d0c9344ec286562a841d155 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 18:15:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 18:15:58 2014 +0000 |
| tree | 421cae1b515b99d073dba6515da34f6c7433cd02 | |
| parent | 3144fde70f16a11a004dc95ca6f6f0f61db57638 [diff] | |
| parent | 567f948b60e9a647610454745b0629c136d492db [diff] |
am 567f948b: am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev * commit '567f948b60e9a647610454745b0629c136d492db': Fix CalendarView to show the right labels. [DO NOT MERGE]