| commit | 90c9e0b9c8d6d9a149777bcbf7bf7cfae6d08339 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Mar 20 01:39:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 01:39:34 2015 +0000 |
| tree | 3958a10483efeb5bfbf8639d580b47c5e2c47b10 | |
| parent | 422812233b44ff358e460c0c884b55f87f5d4e8b [diff] | |
| parent | a3e11ee0f25ba5ea40815138d0ff0b8dadf9810a [diff] |
am a3e11ee0: am 9afb2932: am 6445b0c5: resolved conflicts for merge of 2fa17026 to lmp-mr1-ub-dev * commit 'a3e11ee0f25ba5ea40815138d0ff0b8dadf9810a': Fix android-support-v17-leanback-docs build.