| commit | 872a5a1a93eef53a18d18778104bb8669b4bc073 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:55:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:55:41 2014 +0000 |
| tree | 55c0e9f3d64997cdafc20e130ce03f13b03727ab | |
| parent | 7ce3b5ef64b1a183b75279016e6fc4f65be8c933 [diff] | |
| parent | 01fefec9397569cf9c7c5b599c16126f1b4d6870 [diff] |
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 '01fefec9397569cf9c7c5b599c16126f1b4d6870': Fix CalendarView to show the right labels. [DO NOT MERGE]