am 846764e5: am d3cc051d: am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks

* commit '846764e5aafc21d2bed9c7fde0b43e9548f96617':
  cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
This commit is contained in:
Scott Main 2011-06-28 21:02:05 -07:00 committed by Android Git Automerger
commit d3579e2930

Diff Content Not Available