tree a39510ff59abda3eea0dcf4f56a553078da06259
parent ef4196d0ec0a5e89c51b3cc455f083af2fbf3b98
parent 0e66f16abd651bdf5833f4aede4899e627d7b333
author Katie McCormick <kmccormick@google.com> 1360286328 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360286328 -0800

am 0e66f16a: Merge "Doc change: Scroller Javadoc Bug # 7966653" into jb-mr1-dev

# Via Android (Google) Code Review (1) and Katie McCormick (1)
* commit '0e66f16abd651bdf5833f4aede4899e627d7b333':
  Doc change: Scroller Javadoc Bug # 7966653