OSDN Git Service

am 2eed10ac: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:22:43 +0000 (08:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 May 2013 15:22:43 +0000 (08:22 -0700)
commit30dbdfff1bc20fd0337714f7ff0b94dca061b9a2
treed219d1993008799df6d9302ac7444e9cf89c1dab
parenta75ab0337a2a020575968170d6baab4f96812cfa
parent2eed10ac3f0386d814a7f92e51ee4850fdc7e8d0
am 2eed10ac: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '2eed10ac3f0386d814a7f92e51ee4850fdc7e8d0':
  Fix issue #9000597: PackageManager get NPE while running performance plan