tree 7f4a672e611fcefc957e7651cc8db25ead190881
parent 4c2aec09cf2da437f3995ff4cac87e4c20d1d4b0
parent 5d8a5ade620be65e0e658dbb99e66398f3ffdc74
author Dan Albert <danalbert@google.com> 1416514915 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416514915 +0000

am 5d8a5ade: Merge "Add a pre-C++11 constexpr compatibility macro."

* commit '5d8a5ade620be65e0e658dbb99e66398f3ffdc74':
  Add a pre-C++11 constexpr compatibility macro.