OSDN Git Service

am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 17:14:07 +0000 (17:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 17:14:07 +0000 (17:14 +0000)
commit425addb94428d6f17658256a4acd4b62189c8844
tree5a64720a796605c91a0d609b59fe6e54fa97c8d9
parent07f8da65e231142e6915d9aa7853dd4d772112a0
parenta43aaf00b583e8a88681cdcc6ebe1ae2c52f6f20
am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

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