tree 5c37da21ce33c8c5918c22b888bf526432e4629c
parent 9c114bb76edd1fe6bb0cc94b9e413495b7962887
parent 6508fe1b07ec888012255e3a2438382b45a9707f
author Anton Hansson <hansson@google.com> 1395330905 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395330905 +0000

am 6508fe1b: (-s ours) am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '6508fe1b07ec888012255e3a2438382b45a9707f':
  Fix NPE in when dropping from all apps (issue 12917451)
  update placeholder on package install or restore