am 2b1ffce1: am 7f459df9: Merge "Better errors in PackageManagerTests" into gingerbread

Merge commit '2b1ffce18301ae051a70a85254133c29b9381593'

* commit '2b1ffce18301ae051a70a85254133c29b9381593':
  Better errors in PackageManagerTests