tree 2e9d60ea3e493395559cbfc541151c31b9077c53
parent 0cbfde12fde85713f87d8c5ac0cc137c143dfd27
parent af9fde9680922f072981a4853e37ccfcf974920a
author Deepanshu Gupta <deepanshu@google.com> 1400001850 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400001850 +0000

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]