| commit | 3695fe0cc5cfb7e835d6a5f404958e20580af00c | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Tue May 03 04:13:02 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 03 04:13:02 2016 +0000 |
| tree | 795ffa83ae5348f94adde46b00f72353999994c5 | |
| parent | 8514591af0a302847e3b60facb88f9a5d546f4c5 [diff] | |
| parent | 2393f4449f225500fb07c543f4ee36d2bc3befff [diff] |
resolve merge conflicts of 3481659 to nyc-dev am: 2393f4449f * commit '2393f4449f225500fb07c543f4ee36d2bc3befff': Remove adk docs and channels. Change-Id: Ib7882f650182986baf8da36cf7e7100aca5a0d38