tree d37bfe0df2dc3b79e6aad402c00f612ff25cd509
parent f6b0daf427de7a407406f58a73978e774d3d4260
parent 20262ad1d3f8d620b7227fd8d9e13938243ce32f
author Sen Jiang <senj@google.com> 1534200103 -0700
committer Sen Jiang <senj@google.com> 1534202506 -0700

Merge remote-tracking branch 'aosp/upstream-master' into aosp/master.

The following change is reverted because aosp has newer libchrome.
71818c84 Partially Revert 2b9d241

Added stub override for ReportInternalErrorCode().
Fixed RunPosinstallAction typo.

Bug: 112326236
Test: update_engine_unittests
Change-Id: Ieaae0eef425cbb1278067a48aa19b14ed056317a