tree 9c50497f0d82bb99eed807a84715b827a7d07a73
parent dd35c9898c5e6b28aa3b66786e275b25518031e2
parent d7823c5dfed67b1e8b0e175e588fb2dc643ebc65
author Elliott Hughes <enh@google.com> 1428958330 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428958330 +0000

am d7823c5d: am eab12de7: Merge "Remove unnecessary globals."

* commit 'd7823c5dfed67b1e8b0e175e588fb2dc643ebc65':
  Remove unnecessary globals.