tree 1de80d54758cd1ab3bc0a6b198611458e980ca4c
parent 1ef8498d02a4fa762d24195deefe293556bc807b
parent e8b35395000c2d9a45f162ae761952a4fa9deace
author Elliott Hughes <enh@google.com> 1427566830 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427566830 +0000

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

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