tree cbff6d07d7875a47d1b81692e4f33198d856a249
parent 2bd2dcb3957a409de2c6d788e8c239dc80e8fd31
parent a80adff329db784d8e22510668a4613a4031da0f
author David Turner <digit@android.com> 1304452432 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304452432 -0700

am a80adff3: Merge "emugen - fix wrapper context naming"

* commit 'a80adff329db784d8e22510668a4613a4031da0f':
  emugen - fix wrapper context naming