tree 6295c7f5e13fdf38bd525e4795883381ffe6d4f1
parent b07178467f604057d4e931df32f2f7f0e53d542a
parent 1ccace916c8fdc61f1a8db6677aed518d31647e6
author Kenny Guy <kennyguy@google.com> 1396444207 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396444207 +0000

am 1ccace91: Merge "Rename related users to profiles."

* commit '1ccace916c8fdc61f1a8db6677aed518d31647e6':
  Rename related users to profiles.