| commit | 379d9968ccc31701053eca7e0d809f2f52c0b964 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Fri May 02 22:50:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 02 22:50:25 2014 +0000 |
| tree | 8cf37bfa83e5f2fee7f67ba68fd4971d96684b0d | |
| parent | 01adbdcb954e2d694ec40ac149f07c44defcc796 [diff] | |
| parent | e21bed28acdd21f6000d1de30538839085ffa890 [diff] |
am e21bed28: Merge changes from templates-sdk to templates-sdk-dyn. * commit 'e21bed28acdd21f6000d1de30538839085ffa890': Merge changes from templates-sdk to templates-sdk-dyn.