tree b67ee96845fff58ca7279e075d45512d59214051
parent 78d8510a20be87fb4236e93e1a1c4163047151fc
parent 853b55b96e4af7a4f949a22cc084bd333e528c1c
author Adam Skory <skory@google.com> 1395277974 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395277974 +0000

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

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