am 66efbe79: Merge "Suppress or fix clang errors before the fix from upstream."
authorChih-Hung Hsieh <chh@google.com>
Tue, 6 Jan 2015 20:03:30 +0000 (20:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Jan 2015 20:03:30 +0000 (20:03 +0000)
* commit '66efbe79457a52ffcef470089a35ac39514759f5':
  Suppress or fix clang errors before the fix from upstream.


Trivial merge