tree 38c6d9aeda5461e2a58e0e87cfab8b77c1e24078
parent 84df64d4009aa42ccca1bb4c4b03396fe441f990
parent e8b451dd123b96252026992be3c96c9c577b4245
author Evan Charlton <evanc@google.com> 1414786935 +0000
committer android-build-merger <android-build-merger@google.com> 1414786935 +0000

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

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