tree b8575698b9d92f73f4f840e07957cdc7e285ed9e
parent 4ce3c8288ba030c2d2a80cf94ceb5d2f84a66d26
parent 36dfe06f81fc7b5ce8d9478d30b4d49ac70d4525
author Elliott Hughes <enh@google.com> 1427565995 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427565995 +0000

am 36dfe06f: am 6dbbcc57: Merge "Fix clang build by removing unused locals."

* commit '36dfe06f81fc7b5ce8d9478d30b4d49ac70d4525':
  Fix clang build by removing unused locals.