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

automerge: e8b451d

* commit 'e8b451dd123b96252026992be3c96c9c577b4245':
  Have Pm return the correct code
This commit is contained in:
Evan Charlton
2014-10-31 20:22:15 +00:00
committed by android-build-merger

File diff suppressed because it is too large Load Diff