| commit | 01fefec9397569cf9c7c5b599c16126f1b4d6870 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:50:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:50:45 2014 +0000 |
| tree | 8fe0d234dd5b2bb31f7b9460e535a2b5f672eb59 | |
| parent | 04c9d1932d8a4c0f646a51ce6674535bd77b6172 [diff] | |
| parent | 5fc8f945ee6a763b08e47019319432ec71ba1d1a [diff] |
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 '5fc8f945ee6a763b08e47019319432ec71ba1d1a': Fix CalendarView to show the right labels. [DO NOT MERGE]