OSDN Git Service

am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 17:29:13 +0000 (17:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 17:29:13 +0000 (17:29 +0000)
* commit 'c70ce72a986f029c9f8c43b4060001624176068d':
  Fix CalendarView to show the right labels. [DO NOT MERGE]

1  2 
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java