tree 7711b19dee57a88755d5314d8472aead7361ff83
parent a6db5837d0c5dada119475a2bc982043af30e911
parent 7fb9481d0983f6dd88f8e06b139be696dfc6ce61
author Winson Chung <winsonc@google.com> 1336514517 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336514517 -0700

am 7fb9481d: Merge "Further preventing drags while loading is in progress. (Bug 6276881)" into jb-dev

* commit '7fb9481d0983f6dd88f8e06b139be696dfc6ce61':
  Further preventing drags while loading is in progress. (Bug 6276881)