tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 34fa6d3891aceef6af910f114310cec17e13b372
parent c2e91625a7333ae993bab4c7069f25c2e9ecc8d3
author Dan Albert <danalbert@google.com> 1440646726 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646726 +0000

am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."

* commit 'c2e91625a7333ae993bab4c7069f25c2e9ecc8d3':