tree 213bd4eeed365fb9820f728906dc59e14a7e2d69
parent fed1e5ad3e979507c294cfeaf5b40435ab5a6574
parent 8b5b05b7f3c8c5d705116c425bd5dbff2b75d56a
author Adam Cohen <adamcohen@google.com> 1389390334 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389390334 -0800

am 8b5b05b7: Merge "New launcher2 icon migration algorithm." into jb-ub-now-kermit

* commit '8b5b05b7f3c8c5d705116c425bd5dbff2b75d56a':
  New launcher2 icon migration algorithm.