am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev

* commit '9ddb073bf72d9ca587ecc626dcc9721dd33447c9':
  Fix CalendarView to show the right labels. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-05-13 17:35:00 +00:00
committed by Android Git Automerger

View File

@@ -136,6 +136,7 @@ public final class CreateInfo implements ICreateInfo {
"android.text.format.DateFormat#is24HourFormat",
"android.view.Choreographer#getRefreshRate",
"android.view.Display#updateDisplayInfoLocked",
"android.view.Display#getWindowManager",
"android.view.LayoutInflater#rInflate",
"android.view.LayoutInflater#parseInclude",
"android.view.View#isInEditMode",