| commit | 5c7588bd3700bcef22ef8e87ad0139be29b38fc9 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Wed Aug 31 22:13:34 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 22:13:34 2016 +0000 |
| tree | 215ff0ce67ff8b3c1b3e346c528bf7daa8b87f53 | |
| parent | e4b21d82ebbbcc7b7a80f172ef90d9a4cd9369b6 [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: I11564954529ed7a1cd1098c66b052190f3d3d6f6