tree fccc5da6081a7f8d51993efa64abe3e59f2150d9
parent 3968f0c2dfa5cbb1432d49af47ad2fa89f1b2225
parent ae0bee53b84d4ffda84270852ace1841e13f5db8
author Elliott Hughes <enh@google.com> 1423201801 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423201801 +0000

am ae0bee53: am 81b84311: Merge "Fix clang build."

* commit 'ae0bee53b84d4ffda84270852ace1841e13f5db8':
  Fix clang build.