| commit | 03257fe50c08d9a9ad100b0652e883a3a93a6538 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Fri May 02 23:03:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 02 23:03:45 2014 +0000 |
| tree | cf4cae1a7bbea1e36d0e6cac12ec179af497bd09 | |
| parent | 072923238d277bb24ffc82073d3e11d13a4de2fa [diff] | |
| parent | d19aa4bae2161f89966e38cb099f2f080e2bbfac [diff] |
am d19aa4ba: am 611d7e14: am 379d9968: am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn. * commit 'd19aa4bae2161f89966e38cb099f2f080e2bbfac': Merge changes from templates-sdk to templates-sdk-dyn.