tree 71a5106c7c3bd926eaf68315845d061f71289314
parent 7f319c47c8f5e947638eb1e5e73789ff83123bba
parent db816cef0dd1f1988fbcf3c70a66f9c4acf73358
author Marco Nelissen <marcone@google.com> 1404238528 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404238528 +0000

am db816cef: Merge "Make sure we clean up"

* commit 'db816cef0dd1f1988fbcf3c70a66f9c4acf73358':
  Make sure we clean up