tree de55f0ca29e902be9f347671a732833278dd130e
parent a18832655274e4e66e821ba9f0a29fa82b1f5a38
parent 2b211cf0da0d7485d8e83604a2a5f6ec3371cf7a
author Sasha Smundak <asmundak@google.com> 1533079296 -0700
committer Sasha Smundak <asmundak@google.com> 1533079296 -0700

Merge remote-tracking branch 'aosp/upstream' into mymerge

* aosp/upstream:
  Do not rewrite dependencies on implicit outputs to be the primary output

Test: make test
Change-Id: I787cc8f5c39902cebb257ad7dab0fe0ff608aa9c