tree a27e696f75004216f6ee92b6d16416d5e836d735
parent b32f5037e9870a2dc7034b6c6a95f903dc2a1f0c
parent 65035d2a72fd8c847aa9c78c0e97058535ec18a5
author Adam Powell <adamp@google.com> 1321656475 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321656475 -0800

am 65035d2a: am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1

* commit '65035d2a72fd8c847aa9c78c0e97058535ec18a5':
  Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)