am 1c952028: Merge "Add preprocessor "defined" operator corner cases"
authorPyry Haulos <phaulos@google.com>
Wed, 30 Sep 2015 20:06:46 +0000 (20:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2015 20:06:46 +0000 (20:06 +0000)
* commit '1c952028cf7b088abb9f23b721a4f54210e47c66':
  Add preprocessor "defined" operator corner cases


Trivial merge