tree fa96dc52f751c9360be20b49a78fa01c4bfc64a0
parent f4d017999a51e983b4997ef2e9513d508a718cb2
parent fdc8eb61a417af22dac8bc97dd5f19f728c80060
author Winson Chung <winsonc@google.com> 1441059529 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441059529 +0000

am fdc8eb61: Merge "Fixing NPE in recycler view scroll bar." into ub-launcher3-burnaby

* commit 'fdc8eb61a417af22dac8bc97dd5f19f728c80060':
  Fixing NPE in recycler view scroll bar.