am ddc73f98: am 902b355d: Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread