| commit | 1e080820d112e83157593cf0e2befba8b8b93a43 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Tue May 03 04:13:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 03 04:13:04 2016 +0000 |
| tree | 5f118ff61ab519533f12112e93d784ef2abc1b82 | |
| parent | bc8bfd441b59b4f34930b2704c545b4955e038e2 [diff] | |
| parent | 2393f4449f225500fb07c543f4ee36d2bc3befff [diff] |
resolve merge conflicts of 3481659 to nyc-dev am: 2393f4449f * commit '2393f4449f225500fb07c543f4ee36d2bc3befff': Remove adk docs and channels. Change-Id: I55ee6db9002679065cbecdefd7cdd904d60a19f3