Merge commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp * commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b': ScaleGestureDetector needs to query the displaymetrics
Merge commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp * commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b': ScaleGestureDetector needs to query the displaymetrics