tree 75339d15aa8bcfbad660fde8be37f8b6166c9960
parent e292b01d4476a64b689ac72a9f8dfa25c4ff29cb
parent a706b090ce71146d08a0189b287bba461d943f22
author Winson Chung <winsonc@google.com> 1335483264 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335483264 -0700

am a706b090: Merge "Preventing activity from rotating while the user is dragging an item. (Bug 6240922)" into jb-dev

* commit 'a706b090ce71146d08a0189b287bba461d943f22':
  Preventing activity from rotating while the user is dragging an item. (Bug 6240922)