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)
commit0b11321b7f42c863a4e21dcc823093b25b07dce6
tree5f5c0b073b5da77ad53dc65adc1ff86bfbb3421e
parent0145cf6c9a1120eed6896b368917b12c5d3268e4
parent66efbe79457a52ffcef470089a35ac39514759f5
am 66efbe79: Merge "Suppress or fix clang errors before the fix from upstream."

* commit '66efbe79457a52ffcef470089a35ac39514759f5':
  Suppress or fix clang errors before the fix from upstream.