commit | 9ee142497e1272697393867be0bccddd758aef35 | [log] [tgz] |
---|---|---|
author | Juan Silveira <jjso@google.com> | Thu Mar 20 01:12:55 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 01:12:55 2014 +0000 |
tree | 1d0568291ffac3db2960d6b1bc41731fdcb319ba | |
parent | 6508fe1b07ec888012255e3a2438382b45a9707f [diff] | |
parent | 07130d400c52518e413e58334525f1598c3b8f1a [diff] |
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