tree 4d1dba11c9ff43bb860d1f21fddc2674d02da54d
parent f51d43f0ebfa5739d1ee691d661097dbbad98041
parent 3931f79801b67577bf8ac12d0b3fb5b4aeaaf766
author Andy McFadden <fadden@android.com> 1320190479 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320190479 +0000

am 3931f798: Fix cleanup (cherry-picked from ics-mr1)

* commit '3931f79801b67577bf8ac12d0b3fb5b4aeaaf766':
  Fix cleanup (cherry-picked from ics-mr1)