tree dec1f2fcd8ba821263a4b0179fb0b4318c707a28
parent 7bf8f6f48f2e2a116716e18c6c30ad700c891b19
parent d288c446540a1d09e3315025207200ee591c7563
author Justin Morey <jmorey@google.com> 1484330020 +0000
committer android-build-merger <android-build-merger@google.com> 1484330020 +0000

Merge "Prefix temp files to ensure they are cleaned up" am: b504c8f1b2
am: d288c44654

Change-Id: If625dc1bae06d2f8fc0e8203c984df1db2f537e7