tree bc6ee6140e67c355e1a05805fd8fc27636a404dd
parent 6f6a9761910aadab8e8a972dd88949fdb0f73143
parent f2a23a94cb9649ad7888749a82976ce01988e0f9
author Dan Albert <danalbert@google.com> 1439002257 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439002257 +0000

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

* commit 'f2a23a94cb9649ad7888749a82976ce01988e0f9':
  Use CPPFLAGS instead of CFLAGS.