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