tree 2443274cb13587b9079a0a6fbedbeb7c6e128962
parent e4df64bdaaf86fb7d06715de122a97d723d7fea2
parent 20342ca83012b442913b409a9218635de9bd6aa6
author Swarna Kumar <skumar@google.com> 1259098640 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259098640 -0800

am 20342ca8: am 7f8e3409: Merge change I816428ae into eclair

Merge commit '20342ca83012b442913b409a9218635de9bd6aa6' into eclair-mr2-plus-aosp

* commit '20342ca83012b442913b409a9218635de9bd6aa6':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.