tree 532998a206ddba9bd4b31b009cb0bb4102311438
parent 5abe06bf8bfed0c15dc56b6d2cd30cc10c898153
parent a152ed734f179ee2748d306f2eb57acbb4df1ace
author Christopher Ferris <cferris@google.com> 1390982847 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390982847 +0000

am a152ed73: Merge "Fix global pointing to local variable."

* commit 'a152ed734f179ee2748d306f2eb57acbb4df1ace':
  Fix global pointing to local variable.