tree 75330f23ae3c833d05246167a2099691764baf1e
parent a8f5ce41bad44d6e85787aadc0f398635f0afebb
parent 83d3b12ba6f930ad54ab0cbaa8dffefb23af56c0
author Winson Chung <winsonc@google.com> 1337106914 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337106914 -0700

am 83d3b12b: Merge "Making the page spacing fixed in spring loaded mode. (Bug 6478409)" into jb-dev

* commit '83d3b12ba6f930ad54ab0cbaa8dffefb23af56c0':
  Making the page spacing fixed in spring loaded mode. (Bug 6478409)