tree 79bf6c1f0488ea29bced0cdf318174dcf7a2f246
parent cd76f89f127b3a817f486ec14d76de9d79ecd5bb
parent 9ee142497e1272697393867be0bccddd758aef35
author Juan Silveira <jjso@google.com> 1395330906 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395330906 +0000

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

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