tree 98f92d836f4bc1dcee876e9a3b1c4869be1b5279
parent ece923782ee9aa0593f88e2838afb98ab12501bd
parent 9e1457661ad263e3d8cd38118f70d030b63aa070
author Dan Albert <danalbert@google.com> 1426033399 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426033399 +0000

am 9e145766: am a975f64d: am 5b66af54: Merge "Fix clang build."

* commit '9e1457661ad263e3d8cd38118f70d030b63aa070':
  Fix clang build.