Commits
Brian Carlstrom authored and Android Git Automerger committed 2519f9c6b82M
am de2ad457: Merge "Revert "Grab macros from libbase instead of duplicating"" * commit 'de2ad45784499388d09f2c2c3bcf2fa1966cf018': Revert "Grab macros from libbase instead of duplicating"
Showing diff tode2ad457844