tree e4ff6072472fdf5fdc7615547076d06a50db0aa7
parent ac9d7b403bfa49db11cdb8a75c7c54958d78279b
parent 7b933a5ef764d4716177dc7f060af823a38fa628
author Winson Chung <winsonc@google.com> 1434663613 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434663613 +0000

am 7b933a5e: resolved conflicts for merge of 78564d4e to ub-launcher3-burnaby

* commit '7b933a5ef764d4716177dc7f060af823a38fa628':
  Updating ComponentKey for compatibility with build.