| commit | 26ded8766f742264df814bc04d88aa0b4e081699 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Wed Aug 31 22:16:24 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 22:16:24 2016 +0000 |
| tree | 215ff0ce67ff8b3c1b3e346c528bf7daa8b87f53 | |
| parent | f1d6b8f2a845c790b8adc29eecfadbd1aae57267 [diff] | |
| parent | 5c7588bd3700bcef22ef8e87ad0139be29b38fc9 [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 Change-Id: I0e32bd45e5c12541b7dd65d25a0f09e04ab052bc