| commit | b0f2ded5e9e84fb51ec5b2cb6b419b040b008276 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:39:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:39:14 2014 +0000 |
| tree | 22561947d0d13aef1956e26547711de6cce4fa7b | |
| parent | 6b0c427670606abf5539789299042dc04c67703e [diff] | |
| parent | 40db4a13bc8389dd94cac2fd4c896e10b46c2499 [diff] |
am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev * commit '40db4a13bc8389dd94cac2fd4c896e10b46c2499': Fix CalendarView to show the right labels. [DO NOT MERGE]