tree f3894a7ba669d73e354274b30c8a61115dc60209
parent da91dfbdf20271dffce5357195800cf36183ad97
parent 81b8431173837fe9ea21990948d6af30809fb056
author Elliott Hughes <enh@google.com> 1423201395 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423201395 +0000

am 81b84311: Merge "Fix clang build."

* commit '81b8431173837fe9ea21990948d6af30809fb056':
  Fix clang build.