am 984cf41a: Merge "Have Pm return the correct code" into lmp-mr1-dev automerge: e8b451d
am 984cf41a: Merge "Have Pm return the correct code" into lmp-mr1-dev
automerge: e8b451d

* commit 'e8b451dd123b96252026992be3c96c9c577b4245':
  Have Pm return the correct code

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