tree 73f9dd29691004bc36ce190c91c8487de109b53b
parent 1103ece28c695fc26fcee812870c553dca8d840d
parent 2fb139e02c1e9d2d7c92acf813445a063e73d94f
author Deepanshu Gupta <deepanshu@google.com> 1399998665 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399998665 +0000

am 2fb139e0: resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev

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