tree dee113da3e7076f88b82f750bf8652931d5b3967
parent 47ced247111f1687211ef6f2887d45ccbbd03021
parent 1014e7de0e6c62587b507342f8b477ea84fa635d
author Winson Chung <winsonc@google.com> 1438315812 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438315812 +0000

am 1014e7de: Merge "Prevent crash when flattening ComponentKey to string with invalid user." into ub-launcher3-burnaby

* commit '1014e7de0e6c62587b507342f8b477ea84fa635d':
  Prevent crash when flattening ComponentKey to string with invalid user.