tree a9f306209f01e630f9c36d82b452284da6b8cd8e
parent fd2eabf1e63ee850ab059772a13f870cc293c2d3
parent b0b31d360dba3c1e02f8bae31fa3ddad3ea6c639
author Daniel Rosenberg <drosen@google.com> 1542754454 -0800
committer android-build-merger <android-build-merger@google.com> 1542754454 -0800

Merge "Fix error reporting in cp_commitChanges" am: 2a683d4ce6
am: b0b31d360d

Change-Id: I71ba57abf41afaae7b9f08ed4490fb2c08b5dfe4