tree 7664706ea580bf18e675b73cf4b1ed5696e54b36
parent 7913cf9da692995578fa91cb3e8c46d8b19ef2ab
parent c953898b983d70658e0decf19f48fff3ac462cf7
author Adam Lesinski <adamlesinski@google.com> 1415077456 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415077456 +0000

am c953898b: Fix issues that occurred due to building with clang

* commit 'c953898b983d70658e0decf19f48fff3ac462cf7':
  Fix issues that occurred due to building with clang