tree 9506d64d015c6b49aa4a636180bff68c6fde6e28
parent 61cc5cf0b956a4768e1fa5b94e023d0f610d15a9
parent f4369128a028f87f9e951f18a955ee0dbc3fcf9d
author Josiah Gaskin <josiahgaskin@google.com> 1445297321 +0000
committer android-build-merger <android-build-merger@google.com> 1445297321 +0000

Merge "Update New Project Template Dependencies" am: f908080572
am: f4369128a0

* commit 'f4369128a028f87f9e951f18a955ee0dbc3fcf9d':