OSDN Git Service

am 02d750ef: am 2519f9c6: am de2ad457: Merge "Revert "Grab macros from libbase instea...
authorBrian Carlstrom <bdc@google.com>
Fri, 11 Sep 2015 05:29:47 +0000 (05:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Sep 2015 05:29:47 +0000 (05:29 +0000)
* commit '02d750efde238837989a6968ea66ac5eb13c639e':
  Revert "Grab macros from libbase instead of duplicating"


Trivial merge