tree ef9ce3954972c644dcfca8445d0e27c8b32d9b48
parent 2934076bb5663f8c157b2799097be037ccf202de
parent a9d012c6e67b644498e07c63f36617c1b8915e02
author Hyunyoung Song <hyunyoungs@google.com> 1432249570 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432249570 +0000

am a9d012c6: Merge "Introduce scrollbar in widget tray" into ub-launcher3-burnaby

* commit 'a9d012c6e67b644498e07c63f36617c1b8915e02':
  Introduce scrollbar in widget tray