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