tree 33996d80181e6b4dc3cd4776859b85487df91e91
parent 3e89ed12394e24b82d753c6c360bf59d07a729c2
parent 966c15afbf27e2cdbaee0b800d65d5ea403ddb22
author Marco Nelissen <marcone@google.com> 1285720711 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285720711 -0700

am 966c15af: am 3f502de8: Make party shuffle use the history too, making it less random, but more like users expect. http://b/2535828

Merge commit '966c15afbf27e2cdbaee0b800d65d5ea403ddb22'

* commit '966c15afbf27e2cdbaee0b800d65d5ea403ddb22':
  Make party shuffle use the history too, making it less random, but more like