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

* commit '31c95b93c64601994732dda6ed9de7c44f838596':
  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