tree 9d78c94e67279560475bb55ce8db3b0b2e255656
parent 6285a598c2ce655ef7d93dfc616fde4ddc5c2f85
parent a975f64d97a5b41e0f4f9410d84d84eeb1aa6918
author Dan Albert <danalbert@google.com> 1426000317 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426000317 +0000

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

* commit 'a975f64d97a5b41e0f4f9410d84d84eeb1aa6918':
  Fix clang build.