| commit | ae9124dc54286ecffd9a5054555478368b3287f3 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Jun 28 20:57:40 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 28 20:57:40 2011 -0700 |
| tree | fcf60e712c8ec063d65d20af892cd7fd3e822c75 | |
| parent | 0889d3a6515062fcfc258e2ac2bda67bfb5cc120 [diff] | |
| parent | b79ff7a6a93f420c2cf76414c658f0c93547130e [diff] |
am d3cc051d: am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks * commit 'd3cc051dcb05a32eba1c208792e1bde4654a6db3': cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks