tree 73570402b98e462b2bf1985e20f499ecaaf4dba5
parent df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7
parent 60097a9c5a7214cb73d0bc966adef767743f8798
author Jeff Sharkey <jsharkey@android.com> 1392743791 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1392743791 -0800

am 60097a9c: Merge "Structure device not freed in error case"

* commit '60097a9c5a7214cb73d0bc966adef767743f8798':
  Structure device not freed in error case