am 16568705: am 45838de9: fix Uss accounting in getPssPid() automerge: 72468d2
am 16568705: am 45838de9: fix Uss accounting in getPssPid() automerge: 72468d2

* commit '16568705855f6c8dd78bc188c17e0237c5e827c0':
  fix Uss accounting in getPssPid()

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