tree f1ee20cef27c42ebbe242763e5f0a39fa85cd23a
parent 4f0f57fef7b2c9de262b1ef4b8420d2d4688fe36
parent ac36ed6d5a08b508b3c610cc06a19799da2deb55
author Adam Cohen <adamcohen@google.com> 1414185289 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414185289 +0000

am ac36ed6d: Merge "Was seeing some duplicated icons in the migration flow" into ub-now-queens

* commit 'ac36ed6d5a08b508b3c610cc06a19799da2deb55':
  Was seeing some duplicated icons in the migration flow