tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent b49fe2b7dfad02855d0779e81f4c71be5e76055b
parent 85a77d2abef598099b1f64b9efd1af481f2f62fd
author Dan Albert <danalbert@google.com> 1440684835 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684835 +0000

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

* commit '85a77d2abef598099b1f64b9efd1af481f2f62fd':