tree 583cae068fd4acf2da261029346ec06306a7e563
parent 146e1f1cc70c5b9378962183aecf41ed0b0ccb73
parent c198d02e1a3c433f5d580273e1dbc7396d8fcf0a
author Jesse Hall <jessehall@google.com> 1445008894 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1445008894 +0000

am c198d02e: Fix building on darwin-x86_64 with clang

* commit 'c198d02e1a3c433f5d580273e1dbc7396d8fcf0a':
  Fix building on darwin-x86_64 with clang