tree 3b40011469d381fb81770104918e067cf41bb89f
parent 40b54563743c3bab92ee7086f8a2b159ecef5453
parent 425addb94428d6f17658256a4acd4b62189c8844
author Deepanshu Gupta <deepanshu@google.com> 1400001535 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400001535 +0000

am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

* commit '425addb94428d6f17658256a4acd4b62189c8844':
  Fix CalendarView to show the right labels. [DO NOT MERGE]