tree 8212fda6421e438a5879bb4da21eb3495f20b6f0
parent a4e476b96e74327a43031800110a98b197a53c68
parent 2cd704d9f6686cd4aa9088b7d86aa3e507974b2b
author bohu <bohu@google.com> 1416949100 +0000
committer android-build-merger <android-build-merger@google.com> 1416949100 +0000

Merge "Correctly set error code" into studio-1.0-dev automerge: 7b26ed5
automerge: 2cd704d

* commit '2cd704d9f6686cd4aa9088b7d86aa3e507974b2b':
  Correctly set error code