tree 6062ed93aad97425b7ca48e03f15c141cbb564d7
parent 11f682c4574b53ba6113bb811f197eadde491eb7
parent e1b81bbd6621232fa7ebcaf993bfe3aa7d472fbb
author Chris Banes <chrisbanes@google.com> 1447664873 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1447664873 +0000

Merge "Make sure we honor canChildScrollUp()" into mnc-ub-dev