| commit | 846764e5aafc21d2bed9c7fde0b43e9548f96617 | [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 | 84950cdba9f48ebf32630c0beb6e570ce006d4ac | |
| parent | e1918353e795d4f4fb67760ad593458517976072 [diff] | |
| parent | d3cc051dcb05a32eba1c208792e1bde4654a6db3 [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