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