am c404ed2b: Fix failing unit test; the test was using a deprecated API making...
am c404ed2b: Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Merge commit 'c404ed2b' into eclair-mr2
* commit 'c404ed2b':
Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.