| commit | 5b5e03c2e6a1694b7961b82eb4c91640b6772a64 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Wed Aug 31 22:19:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 22:19:24 2016 +0000 |
| tree | a88db3d635f6978dbab794e3fba132b0ff38ec51 | |
| parent | f81ba20ad8aa0f13ac9a0f9688f489466e33db26 [diff] | |
| parent | 26ded8766f742264df814bc04d88aa0b4e081699 [diff] |
Merge all of templates-sdk-dev into templates-sdk. I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/ and then renamed it to templates-sdk/. So this is a clean copy. Once this goes through cleanly, I'll delete templates-sdk-dev/ and update all doc targets to use templates-sdk/. am: 4f3a05a2c6 am: 5c7588bd37 am: 26ded8766f Change-Id: I92814d1ad60bb0417a3b4d1165dd13924b0e7ad2