tree 16700099b89e511751ed747322c0cb566af2d170
parent 8855f0e81a9c469a51960695f8cc37d6cddaa6fd
parent c56923d09cf8292c2b415310698524ebca5b9d5f
author Chet Haase <chet@google.com> 1436928958 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436928958 +0000

am c56923d0: am fc48292f: am 0c0b57d3: Merge "Fix AbsListViewTest.testSetOnScrollListener()" into mnc-dev

* commit 'c56923d09cf8292c2b415310698524ebca5b9d5f':
  Fix AbsListViewTest.testSetOnScrollListener()