tree ff5bf30242ff444d41cfeb257d4914bb38905b2e
parent 034c789f279ce41e3fb0b03a1a09f5591dd24b87
parent 6e2ee9ad8a0aeff3231f9937e46cc663aa2a64c5
author Josiah Gaskin <josiahgaskin@google.com> 1445307829 +0000
committer android-build-merger <android-build-merger@google.com> 1445307829 +0000

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

* commit '6e2ee9ad8a0aeff3231f9937e46cc663aa2a64c5':