Merge "This should handle multiple directories"
authorAric Gardner <agardner@linuxfoundation.org>
Wed, 26 Aug 2015 21:07:29 +0000 (21:07 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 26 Aug 2015 21:07:29 +0000 (21:07 +0000)

Trivial merge