tree ff5bf30242ff444d41cfeb257d4914bb38905b2e
parent 8c9d55edf9f8fb2d78e2e0a24b9d8fc53dadc76e
parent b3d01579a09d632ecbd090c533687256e520d74f
author Josiah Gaskin <josiahgaskin@google.com> 1445306733 +0000
committer android-build-merger <android-build-merger@google.com> 1445306733 +0000

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

* commit 'b3d01579a09d632ecbd090c533687256e520d74f':