tree 6c1a1bb9fa9ccee73ea5d061b9f0faa801c6bcb1
parent e2ac9a975c111f4f020b2655f798fa61b942988c
parent 519d8895a29dd78f5250ee2ececac4e03a6f5b70
author Dianne Hackborn <hackbod@google.com> 1381957552 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381957552 -0700

am 519d8895: am 9c446d82: Merge "Fix issue #11217255: Setup Wizard ANR when adding new user profile from settings." into klp-dev

* commit '519d8895a29dd78f5250ee2ececac4e03a6f5b70':
  Fix issue #11217255: Setup Wizard ANR when adding new user profile from settings.