tree bf6470ab0f985b10c66814f3f7a83e053de43a4d
parent 1a34d6c86db9a52e245fd45afe5dbdf4a9714e4d
parent 533d3546217b86bd52c0869316e15b5b4bcb4d6b
author Romain Guy <romainguy@google.com> 1270854497 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1270854497 -0700

Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo