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

Browse Source

* 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

...

This commit is contained in:

The Android Open Source Project

2013-06-03 14:03:45 -07:00

committed by Android Git Automerger

parent 66e016ef7e c9d0b4e70d

commit 8202f732bf

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available