tree a97c7b20718808adf0e8a88198e7d62ad40f4b33
parent 30f9cd1e8ad14ec63015d20e16d2810de2c0f0ef
parent 7cfce9464e40fbd1e7b6308d6356da27a7082c81
author Kenny Guy <kennyguy@google.com> 1400242086 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400242086 +0000

am 7cfce946: Merge "Reset profile ids when backing up / restoring favorites." into ub-now-nova

* commit '7cfce9464e40fbd1e7b6308d6356da27a7082c81':
  Reset profile ids when backing up / restoring favorites.