tree b108cf08405b3a50369514c90e345daa8f2aac47
parent 4573e29faf40983f9d1df99bb0f506d77a868e05
parent 8a9f5d42a5cc373439ee8bbb9185dcce9086770d
author Dianne Hackborn <hackbod@google.com> 1347317399 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347317399 -0700

Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev