| commit | 0e35de1436bfe6f7c22b2e0f3e5a71c57b4a9610 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Wed Aug 31 22:17:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 22:17:16 2016 +0000 |
| tree | a83217a50cb3e0e7fce7d42eb6cb89ed6674d62f | |
| parent | 1a276819a1ce3885cdf4fa138660d941f85fa09e [diff] | |
| parent | 4f3a05a2c6bc26a1747d143ae0f69eac05936c61 [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 Change-Id: Icd5ae3ecdeb840c347c6bedcfc802fe2e6c4a76f