tree 302f0da2c596ea63ee03c501382c5686238180bf
parent 4ad4b8603cc0af86424e3224f683a35c96f88d21
parent f58f4b9517220a8672b262ab2a83b52fd1fdebab
author Jeff Sharkey <jsharkey@android.com> 1348006457 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348006457 -0700

am f58f4b95: Merge "Multi-user MTP, handle secondary user boot." into jb-mr1-dev

* commit 'f58f4b9517220a8672b262ab2a83b52fd1fdebab':
  Multi-user MTP, handle secondary user boot.