am 72da3a46: am c404ed2b: Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.

Merge commit '72da3a467e46453e87549492ccec47e1feda6fe2' into eclair-mr2-plus-aosp

* commit '72da3a467e46453e87549492ccec47e1feda6fe2':
  Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.