commit 8202f732bf727c4784ddd81e31cbf18a4221ca88
author The Android Open Source Project <initial-contribution@android.com> Mon Jun 03 14:03:45 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 03 14:03:45 2013 -0700
tree ee10c8bd8d5f662827800d33398c931497d762b7
parent 66e016ef7e62b5909b63605224ea336975d840ca
parent c9d0b4e70d06e1feb19b2ac2afd74e4a41ce07bb

am c9d0b4e7: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'c9d0b4e70d06e1feb19b2ac2afd74e4a41ce07bb':
  Whtelist for ug   b/9106968 	modified:   permission/src/android/permission/cts/FileSystemPermissionTest.java
  Add GFX char devi to the whitelist 	modified:   permission/src/android/permission/cts/FileSystemPermissionTest.java
  increase margin to 30%
  change testLoop to create its own Looper in a separate thread
  Bail out early in case of error
  Fix coordinate count
  add polling check to GridViewTest
  add polling check for focus / dialog
  Fix check for current EGL context
  lessen fail criteria for openglperf
  camera tests: handle configurationChanges for orientation ourselves