983d4583e7
Merge commit 'dec43a102226de55307de20d5779e20a435be8b1' into gingerbread-plus-aosp * commit 'dec43a102226de55307de20d5779e20a435be8b1': Fix up PackageManager tests