| commit | 0c8415a080f28b0dff25fc6861879862d52b735d | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Tue May 03 04:15:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 03 04:15:16 2016 +0000 |
| tree | 579f011566c76eaf82b7ff58d62d0a3bfd20a3e7 | |
| parent | b5c5499072e47e27b1a362ab5ed42faa94db5587 [diff] | |
| parent | 1e080820d112e83157593cf0e2befba8b8b93a43 [diff] |
resolve merge conflicts of 3481659 to nyc-dev am: 2393f4449f am: 1e080820d1 * commit '1e080820d112e83157593cf0e2befba8b8b93a43': Remove adk docs and channels. Change-Id: Icc2509601099aad525958cb6879e878b3e117c14