| commit | 8a9d4732d270a82475147930a162466f2e84e7a5 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Wed Aug 31 22:19:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 31 22:19:29 2016 +0000 |
| tree | 982f2a13249f8cc644059aa78cd09c02350b3a74 | |
| parent | 825ea362b1bc5d37d6ee349b4f38cddccc93e256 [diff] | |
| parent | 0e35de1436bfe6f7c22b2e0f3e5a71c57b4a9610 [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: 0e35de1436 Change-Id: I7b0a435755ad7a18acbd83bdb30fd3e9bee4577f