Merge "ldpi: Remove cm_girls from overlay" into gingerbread