| commit | d19aa4bae2161f89966e38cb099f2f080e2bbfac | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Fri May 02 22:58:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 02 22:58:02 2014 +0000 |
| tree | fa9edf94a1d2e0d93b1945e2003193093e39dc12 | |
| parent | 09e044ea813cc23b1d3b5ed99b20dea9ec7c5328 [diff] | |
| parent | 611d7e14e87d030cd5d89b932a1877289ab68e8d [diff] |
am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn. * commit '611d7e14e87d030cd5d89b932a1877289ab68e8d': Merge changes from templates-sdk to templates-sdk-dyn.