summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/LauncherScroller.java
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 13ef17a3 to mnc-dr-devHyunyoung Song2015-07-221-3/+2
| | | | | b/22609402 Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
* Syncing up state transition with paging transitionAdam Cohen2013-11-181-0/+559
Change-Id: Id91e4c046cfe7d9aa6e7de10dbf57ee727ba160e