tree 60733458703b0960da43d58aadc52543489c2262
parent f6b714ba6104315dd0c2a9bb17512e568c4e9527
parent ab2de41574d15bac8c3ef8f49cfba493ea501a0a
author Christopher Ferris <cferris@google.com> 1390999779 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390999779 +0000

am ab2de415: am 773c9ab7: am c96c2954: am a152ed73: Merge "Fix global pointing to local variable."

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