tree 8cfe327284ceacb22e4758305705bbce54d72cd4
parent a9390df6c6b8d6cc98b102aeffc8e7acd300c857
parent e67104a6a778f70bd479e737b09eb32c835e250e
author Dan Albert <danalbert@google.com> 1438995076 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438995076 +0000

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

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