Merge "Clean up CFlags.cmake"
authorPyry Haulos <phaulos@google.com>
Mon, 10 Nov 2014 19:06:50 +0000 (19:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 10 Nov 2014 19:06:50 +0000 (19:06 +0000)

Trivial merge