tree 44f6f48cee8697d0f00efff7d9600f5461b5aae7
parent 98611c57980ffd67f2dfc2894dc1ae82511d0b9a
parent d5c106ccba9720fb25a68a8cfa56b857d422fc13
author Victoria Lease <violets@google.com> 1369095035 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369095035 -0700

am d5c106cc: am 7cf81f86: Merge "short-term fix for flaky CTS tests that need focus" into jb-mr2-dev

* commit 'd5c106ccba9720fb25a68a8cfa56b857d422fc13':
  short-term fix for flaky CTS tests that need focus