| commit | 58dcef7b28ec0bbc8e097b2cd45a6c6542a4cdef | [log] [tgz] |
|---|---|---|
| author | Juan Silveira <jjso@google.com> | Thu Mar 20 15:55:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 15:55:06 2014 +0000 |
| tree | 79bf6c1f0488ea29bced0cdf318174dcf7a2f246 | |
| parent | cd76f89f127b3a817f486ec14d76de9d79ecd5bb [diff] | |
| parent | 9ee142497e1272697393867be0bccddd758aef35 [diff] |
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