tree 02d99e5d9a29468dd59ed8ebe34b4787a6b72605
parent 186367f3b36e0d6894cf305338175e037052e6eb
parent 601ea30c0b4a760b8b5a89a3aa78ecf2442bc98d
author Nicolas Geoffray <ngeoffray@google.com> 1426505137 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426505137 +0000

am 601ea30c: am acf0a8b3: Merge "Revert "Add commonly used C++ macros to libbase.""

* commit '601ea30c0b4a760b8b5a89a3aa78ecf2442bc98d':
  Revert "Add commonly used C++ macros to libbase."