tree 1743e3b219f54649d475742a30ab3b0136ad9503
parent b080ca5a230fd103fa591b03cf69c381332d84b6
parent 3aeec65f6398183ea8dd086f4d33cbc32cbce8c7
author The Android Open Source Project <initial-contribution@android.com> 1349195082 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349195082 -0700

am 3aeec65f: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '3aeec65f6398183ea8dd086f4d33cbc32cbce8c7':
  Update environment variable for multi-user.