tree 053d12d07e4e25840458881e7dfbc0700c278db9
parent 57e6136ce79241348b3563c4368a327ca2906610
parent b3e02c44d57ac18d1debf21044289cf85d0dd672
author Adam Powell <adamp@google.com> 1336068053 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1336068053 -0700

Merge "Fix nested cross-scrolling for ScrollView/HorizontalScrollView" into jb-dev