| commit | 02d750efde238837989a6968ea66ac5eb13c639e | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri Sep 11 05:22:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 11 05:22:29 2015 +0000 |
| tree | 21718a334788edf71b0885795d408f81f1841fa4 | |
| parent | d8834950c22cb04b0d6926533930359ff2892f84 [diff] | |
| parent | 2519f9c6b822ed0201a3a6f1bb73d486609cd677 [diff] |
am 2519f9c6: am de2ad457: Merge "Revert "Grab macros from libbase instead of duplicating"" * commit '2519f9c6b822ed0201a3a6f1bb73d486609cd677': Revert "Grab macros from libbase instead of duplicating"