tree fc76b7e5ae40a08db3283b5ef9522fc42b8db00e
parent 837d3212906159a7483670ce98bcba3a2606cd5e
parent edbca1285e4757900e43d31087451d1953555d7d
author Romain Guy <romainguy@google.com> 1333594054 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1333594054 -0700

Merge "Make sure we clean up after ourselves"