Merge "clarify dp dimension description" into froyo