| commit | 909f840cdaf4f172b29c2c56921c4619165c4820 | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Wed Jan 07 10:09:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 07 10:09:52 2015 +0000 |
| tree | 1cd783346b0f81149f53b1a9e90380f3b3949048 | |
| parent | 8b2b71f51187528ec80241f4cc5c6f7e2f67d048 [diff] | |
| parent | 4c5b5cffa7412a66cb56fe7b78daa7c0ee3d689a [diff] |
am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev * commit '4c5b5cffa7412a66cb56fe7b78daa7c0ee3d689a': docs: Checklist for TV Apps