tree 38d6e69a88e1c03b18c8d2f9104d8635c8212474
parent 24f681fd6c17efc715cac68495d3c64bda8317e2
parent ce7d151a4a11169976a7055484f1ed4ca9faa105
author Wei Huang <weih@google.com> 1321391460 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321391460 -0800

am bfbd7bb4: Merge "Fix 5481444 Face clustering should use PWA profile shot instead of random photo" into ics-mr1

* commit 'bfbd7bb47582be2a636eadffb041a698c52817f6':
  Fix 5481444 Face clustering should use PWA profile shot instead of random photo