tree 857a9b3a195f6a3f42fddfa067864752a7d64c00
parent 5304df866b7f45de149c854ffabce98a24e556e9
parent 87602ab5484211b654bb90d61517be12ab50a9f3
author Julien Desprez <jdesprez@google.com> 1499845977 +0000
committer android-build-merger <android-build-merger@google.com> 1499845977 +0000

Merge "Clean Up tmp file from tests" into oc-dev
am: 87602ab548

Change-Id: I3113353eb13067f6f7277b7e6b1e42321f313240