tree 29e54a3ff4529a6f2988e4d234b5f18e781c95d0
parent 6f3bc434372fc5bed19f1acefe53defe474516ea
parent 34813a57212affef9dd3578c49b57db8d9aa8df3
author Dirk Dougherty <ddougherty@google.com> 1471612523 +0000
committer android-build-merger <android-build-merger@google.com> 1471612523 +0000

Merge "update dac legacy templates for N release." into nyc-dev am: c5a1c1b3c4
am: 34813a5721

Change-Id: I44a8bf1ec103cc6a2cef4ffc0f5e510dd84a47da