tree bc6ee6140e67c355e1a05805fd8fc27636a404dd
parent 2496489cb4ec75f13b0d30f580332e74bf4a2fa8
parent 236b3eb6a085bd0762849b5feca880f6dc63787d
author Dan Albert <danalbert@google.com> 1438995372 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438995372 +0000

am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."

* commit '236b3eb6a085bd0762849b5feca880f6dc63787d':
  Use CPPFLAGS instead of CFLAGS.