| commit | 425addb94428d6f17658256a4acd4b62189c8844 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:14:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:14:07 2014 +0000 |
| tree | 5a64720a796605c91a0d609b59fe6e54fa97c8d9 | |
| parent | 07f8da65e231142e6915d9aa7853dd4d772112a0 [diff] | |
| parent | a43aaf00b583e8a88681cdcc6ebe1ae2c52f6f20 [diff] |
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]