| commit | 9afb2932e680fddb9ac7eaeb7f630c559db962a7 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Mar 20 00:51:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 00:51:26 2015 +0000 |
| tree | 26a5961067b77b1f17ac550aa852599b7714b103 | |
| parent | bf3531cff30a23cb87db38a1a942de58d0603733 [diff] | |
| parent | 6445b0c53daed35dafaf1d9cefbeabf2385099c2 [diff] |
am 6445b0c5: resolved conflicts for merge of 2fa17026 to lmp-mr1-ub-dev * commit '6445b0c53daed35dafaf1d9cefbeabf2385099c2': Fix android-support-v17-leanback-docs build.