| commit | b79ff7a6a93f420c2cf76414c658f0c93547130e | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Jun 28 20:50:12 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 28 20:50:12 2011 -0700 |
| tree | cc677d7f751d9900458c481845dead6e9404d065 | |
| parent | 6fa3003e469b08230847eddb7d9771eb75cb68b4 [diff] | |
| parent | ab2d68180062cf2f6a9bdca0a68faecbcd418ce1 [diff] |
am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks * commit 'a687045045157eab2dbf657bb085cb0af68d72f2': cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks