Merge commit 'd782b4b6f3411ece7299f414783baa3758756bbe' into eclair-plus-aosp * commit 'd782b4b6f3411ece7299f414783baa3758756bbe': Add keyguard permission to instrumented ImfTest package.
Merge commit 'd782b4b6f3411ece7299f414783baa3758756bbe' into eclair-plus-aosp * commit 'd782b4b6f3411ece7299f414783baa3758756bbe': Add keyguard permission to instrumented ImfTest package.