am 34e5e8ca: am 3280e89e: Merge "Fix for CTS testScreenConfiguration" into gingerbread

* commit '34e5e8ca05f04ef8b19f5d7e5fd6bf676f85d214':
  Fix for CTS testScreenConfiguration