tree 1d0568291ffac3db2960d6b1bc41731fdcb319ba
parent 6508fe1b07ec888012255e3a2438382b45a9707f
parent 07130d400c52518e413e58334525f1598c3b8f1a
author Juan Silveira <jjso@google.com> 1395277975 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395277975 +0000

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

* commit '07130d400c52518e413e58334525f1598c3b8f1a':
  Implement spring-loading of folders when dragging over.
  Do updateWorkspaceScreenOrder inside a single transaction.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE