tree 42a32d060a674728d8f067f27b36a32b2adae11e
parent b346133679f409e3f4e7389c5dced451b9980a57
parent d0642c4274abcbede9177d61b0f072689db889a9
author Anton Hansson <hansson@google.com> 1395277974 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395277974 +0000

am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

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