OSDN Git Service

am 0db9ea92: Merge "Fix a preprocessor warning exposed by -Wundef."
authorStephen Hines <srhines@google.com>
Tue, 2 Dec 2014 22:00:35 +0000 (22:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Dec 2014 22:00:35 +0000 (22:00 +0000)
* commit '0db9ea923309f514a3216826593b325cffcfbbbf':
  Fix a preprocessor warning exposed by -Wundef.


Trivial merge