tree 63f263e7f4f6830642faf1ab778d9b40ef3ca1ec
parent ca342c284db250d65441cc0bf2db72a86e540f95
parent 9afb2932e680fddb9ac7eaeb7f630c559db962a7
author Ying Wang <wangying@google.com> 1426813129 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426813129 +0000

am 9afb2932: am 6445b0c5: resolved conflicts for merge of 2fa17026 to lmp-mr1-ub-dev

* commit '9afb2932e680fddb9ac7eaeb7f630c559db962a7':
  Fix android-support-v17-leanback-docs build.