Merge "Add preprocessor "defined" operator corner cases"
authorPyry Haulos <phaulos@google.com>
Wed, 30 Sep 2015 17:53:50 +0000 (17:53 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 30 Sep 2015 17:53:50 +0000 (17:53 +0000)

Trivial merge