tree 819af95a5a39726129d3d8f82e89c414aea185d8
parent 12f2724bc98ddfd50af3f6015feca4c366eda175
parent de2ad45784499388d09f2c2c3bcf2fa1966cf018
author Brian Carlstrom <bdc@google.com> 1441948537 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441948537 +0000

am de2ad457: Merge "Revert "Grab macros from libbase instead of duplicating""

* commit 'de2ad45784499388d09f2c2c3bcf2fa1966cf018':
  Revert "Grab macros from libbase instead of duplicating"