| commit | 7298affd759dbe22a3d9c72920c0380c695481c4 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Wed Aug 31 22:22:25 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 22:22:25 2016 +0000 |
| tree | 982f2a13249f8cc644059aa78cd09c02350b3a74 | |
| parent | 8a9d4732d270a82475147930a162466f2e84e7a5 [diff] | |
| parent | 5b5e03c2e6a1694b7961b82eb4c91640b6772a64 [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 am: 5b5e03c2e6 Change-Id: Ia5a48e32ce6dbe3090d8862002525c830cc25e29