tree 7f7e0d0546b87bbf20991c2f3b93eeb6d7bea529
parent 2915a7b9a45821a7530d2fea8a982bc1b6efc7d3
author Alex Vakulenko <avakulenko@google.com> 1444314863 -0700
committer Alex Vakulenko <avakulenko@google.com> 1444315497 -0700

Removing mnc-brillo-dev specific changes to weaved

Moved recent changes to weaved from Brillo branch to AOSP and used
conditional compilation to compile Brillo-specific code on Brillo only.

This eliminates differences in source files for the branch and future
code merge issues.

Change-Id: I355a1022cb0d31ea1ab7e0c476824ebbad1af43c