tree 51777037069c8333c433f7142441b6192e2ce404
parent 292ad22f52c3cc92719941717093e65d01ba6e25
parent 18a0d2e9b5d0c3f753e527da95e10779ed0f20fe
author Dan Willemsen <dwillemsen@google.com> 1502235632 -0700
committer Dan Willemsen <dwillemsen@google.com> 1502235653 -0700

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

* aosp/upstream:
  Support custom trace functions
  Implement microfactory Config, Build
  Allow microfactory to be used as a package
  Stop passing path to microfactory source

Test: m -j blueprint_tools
Change-Id: I857aeb6970d4d51489513f6ea789064d0f9f6556