tree 196b09826c968bfb07619443ec5a5e05c4884b02
parent 6d00e69c3ff9329c09f71e45370ad0bf581a668d
author smain@google.com <smain@google.com> 1472668202 -0700
committer smain@google.com <smain@google.com> 1472668202 -0700

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/.

Change-Id: I276695969e02fcf718370564e84b077a9d43725e