Merge "CtsUiAutomatorTest pinchin/pinout test case: add support for 480X320 pixel solution device. The pinchin/pinout test need the device solution bigger than ***X400. This is hardcode in the CtsUiAutomatorTest.java the source code is: withinMarginOfError(0.1f, screenRect.centerX(), p2s.x))  private boolean withinMarginOfError(float marginPrecent, int expected, int actual) {        int m = (int) (marginPrecent * expected);        return actual >= expected - m && actual <= expected + m;      }" into kitkat-cts-dev
automerge: 53fbbd0

* commit '53fbbd05adfb1992528f621be07e6b2c8790d890':
  CtsUiAutomatorTest pinchin/pinout test case: add support for 480X320 pixel solution device. The pinchin/pinout test need the device solution bigger than ***X400. This is hardcode in the CtsUiAutomatorTest.java the source code is: withinMarginOfError(0.1f, screenRect.centerX(), p2s.x))  private boolean withinMarginOfError(float marginPrecent, int expected, int actual) {        int m = (int) (marginPrecent * expected);        return actual >= expected - m && actual <= expected + m;      }