tree dc3c448767ef973c3df7a03f659d53e09532ea2c
parent 5e637bd05d3b8f6a7cbd62126c827f419dd97506
parent 05177f7cb1e98b23a0c4b8899ba636ef7228e62b
author Dan Willemsen <dwillemsen@google.com> 1450309495 +0000
committer android-build-merger <android-build-merger@google.com> 1450309495 +0000

Merge "Define __BRILLO__ only for target modules" am: e63d3328df
am: 05177f7cb1

* commit '05177f7cb1e98b23a0c4b8899ba636ef7228e62b':
  Define __BRILLO__ only for target modules