tree eb9d8fe5e0c557271decef50e5a49f5a182a5ad5
parent 4740e6ce15f55fa374d464be7c14981c9325a74c
parent ac929f4ad80fabeddfae51e30ec5d7ff434652c8
author Tony Wickham <twickham@google.com> 1449098302 +0000
committer android-build-merger <android-build-merger@google.com> 1449098302 +0000

Merge "Disallow scrolling if workspace is in transition." into ub-launcher3-burnaby-polish
am: ac929f4ad8

* commit 'ac929f4ad80fabeddfae51e30ec5d7ff434652c8':
  Disallow scrolling if workspace is in transition.