tree c9a0870afdf28cb7be7309e8445399104339313f
parent 86ef717e2660dbc914dcf68295fbf9943c45bc44
parent 8f4fbc5c9f52157439af6a73ee556cc80d041f5f
author Brett Chabot <brettchabot@android.com> 1259183368 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259183368 -0800

am 8f4fbc5c: am d782b4b6: Add keyguard permission to instrumented ImfTest package.

Merge commit '8f4fbc5c9f52157439af6a73ee556cc80d041f5f' into eclair-mr2-plus-aosp

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