tree 16931d8f2574cc22d90136e202f00e80fe608aa7
parent 7adb2828f48e57c620f232c64d7c012774fa80a3
parent 5b66af5477511ee2f0d68f7267dd4b62c77ff5d9
author Dan Albert <danalbert@google.com> 1425953424 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425953424 +0000

am 5b66af54: Merge "Fix clang build."

* commit '5b66af5477511ee2f0d68f7267dd4b62c77ff5d9':
  Fix clang build.