| commit | c70ce72a986f029c9f8c43b4060001624176068d | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:24:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:24:10 2014 +0000 |
| tree | 2e9d60ea3e493395559cbfc541151c31b9077c53 | |
| parent | 0cbfde12fde85713f87d8c5ac0cc137c143dfd27 [diff] | |
| parent | af9fde9680922f072981a4853e37ccfcf974920a [diff] |
am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev * commit 'af9fde9680922f072981a4853e37ccfcf974920a': Fix CalendarView to show the right labels. [DO NOT MERGE]