tree da30d928f51509fe12128f7da8aed7650ae93cab
parent ede47acf8d32b2e5621c7e8be7d0ef2f626218f4
parent fbab2ed4edc87995407f0898aae5e0f0253be026
author Josiah Gaskin <josiahgaskin@google.com> 1445302463 +0000
committer android-build-merger <android-build-merger@google.com> 1445302463 +0000

Merge "Update New Project Template Dependencies" am: f908080572 am: f4369128a0 am: 0562b43a09 am: 22b7ea6e04
am: fbab2ed4ed

* commit 'fbab2ed4edc87995407f0898aae5e0f0253be026':