commit 6e819bc15696dd9b0cce82b247a8821313f5c319
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 80f93cede8f9027eb697f4c0b0568132b4bdd044
parent 76f01c7288d59edfbdc04e65cfbb8eb6ed27c1fb
parent 207cf5496afdf69f26777636448f1e747b3d1792

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

* commit '207cf5496afdf69f26777636448f1e747b3d1792':
  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