tree 406e7aac7b3f9cd6ace192c0efc7d6f1ff13b367
parent b77da19e59fee9dda1177aaf312551210bcdf679
parent 899c15ef2053f0cebfeda90b5211e80310e6f278
author Marco Nelissen <marcone@google.com> 1404238901 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404238901 +0000

am 899c15ef: am db816cef: Merge "Make sure we clean up"

* commit '899c15ef2053f0cebfeda90b5211e80310e6f278':
  Make sure we clean up