OSDN Git Service

am 7f0f30c6: Merge "Fix clang build."
authorElliott Hughes <enh@google.com>
Mon, 2 Feb 2015 18:36:22 +0000 (18:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Feb 2015 18:36:22 +0000 (18:36 +0000)
commit5f7819d6f1b2cb706d818e3083d45337e35d386b
tree98bd3d7bf1fd1f9d2b438985f9973e46529d83a5
parent0a302e0174da4432da4a6ad5ce126dc27e4a86de
parent7f0f30c6e20c1bf04bec05077eef2d779e7a32df
am 7f0f30c6: Merge "Fix clang build."

* commit '7f0f30c6e20c1bf04bec05077eef2d779e7a32df':
  Fix clang build.