tree 0a1ddb736e404930e1a04e1dd4bc7bc1f3242b9d
parent 80a01a7f1d30ea5540eb8827dd221623f46e5a80
parent b68702eb0526633e51d9dbfe6fc971c168e1274a
author Katie McCormick <kmccormick@google.com> 1360286489 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360286489 -0800

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

# Via Android (Google) Code Review (1) and others
* commit 'b68702eb0526633e51d9dbfe6fc971c168e1274a':
  Doc change: Scroller Javadoc Bug # 7966653