tree 52912d97597d16baa92b5af2724e12cf92cbcd05
parent 135f5dc7b1302ba3cab48f4738d5ed1450bcb896
parent 6435abb2c5883ceb85598a9c690ea8f744df6b5f
author Nick Kralevich <nnk@google.com> 1381785224 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381785224 -0700

am 6435abb2: Merge "Fix build for c99"

* commit '6435abb2c5883ceb85598a9c690ea8f744df6b5f':
  Fix build for c99