tree ab0c10848dc4545b1865e7ddea96afb8d95db860
parent 99cee0318bdceb6e996bbe9a3e0f961d622e0365
parent d782b4b6f3411ece7299f414783baa3758756bbe
author Brett Chabot <brettchabot@android.com> 1259182975 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259182975 -0800

am d782b4b6: Add keyguard permission to instrumented ImfTest package.

Merge commit 'd782b4b6f3411ece7299f414783baa3758756bbe' into eclair-mr2

* commit 'd782b4b6f3411ece7299f414783baa3758756bbe':
  Add keyguard permission to instrumented ImfTest package.