Merge commit '3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp * commit '3208557edca8c133fa32b7718acd22d77f1a9475': clarify dp dimension description
Merge commit '3208557edca8c133fa32b7718acd22d77f1a9475' into gingerbread-plus-aosp * commit '3208557edca8c133fa32b7718acd22d77f1a9475': clarify dp dimension description