tree 8fe0d234dd5b2bb31f7b9460e535a2b5f672eb59
parent 04c9d1932d8a4c0f646a51ce6674535bd77b6172
parent 5fc8f945ee6a763b08e47019319432ec71ba1d1a
author Deepanshu Gupta <deepanshu@google.com> 1400003445 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400003445 +0000

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]