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