am 009ea5a0: Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev
am 009ea5a0: Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev

* commit '009ea5a04c38dd209b73d28cb867f05e63ec89cc':
  USER_CURRENT_OR_SELF had the same int as USER_CURRENT!

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base