am e66df909: (-s ours) am 82c66da0: (-s ours) am c2e98ca3: am 68ff174b: (-s ours) am 2b99b5da: am c9862b44: An ugly hack to render CalendarView. [DO NOT MERGE]

* commit 'e66df909b9e138d8254c1a5bb08fe79bf473aa69':