am e3d89013: am 5c6912c6: Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev
am e3d89013: am 5c6912c6: Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev

* commit 'e3d89013c6dc683f911a2372b11ffa3542dd10ae':
  Fix permission check on ContentProvider to be multi-user aware.

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