tree 5c37da21ce33c8c5918c22b888bf526432e4629c
parent 298a9c61853b7460d5dbe14429f05f8f2deed6bc
parent b346133679f409e3f4e7389c5dced451b9980a57
author Adam Skory <skory@google.com> 1395330148 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395330148 +0000

am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit 'b346133679f409e3f4e7389c5dced451b9980a57':
  Small refactor to separate adding workspace / all apps items
  Fix deprecated EMPTY_ARRAY usage (nanoprotos).