tree bf07606147d836e8ad9e02a6fb12e419d9b29ab4
parent 0504b546629a65b8c9bbd3be86cdb83a1d415e9d
parent b27a4f9b0e29d4fd4722c9152a39269aba527ef6
author John Reck <jreck@google.com> 1337215042 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337215042 -0700

am b27a4f9b: Merge "Remove custom scrollbar logic" into jb-dev

* commit 'b27a4f9b0e29d4fd4722c9152a39269aba527ef6':
  Remove custom scrollbar logic