Merge "Clean up temporary artifacts on merge"
authorAric Gardner <agardner@linuxfoundation.org>
Thu, 28 May 2015 15:05:19 +0000 (15:05 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 28 May 2015 15:05:19 +0000 (15:05 +0000)

Trivial merge