OSDN Git Service

am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e...
authorScott Main <smain@google.com>
Wed, 29 Jun 2011 03:50:12 +0000 (20:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jun 2011 03:50:12 +0000 (20:50 -0700)
commitd3cc051dcb05a32eba1c208792e1bde4654a6db3
tree2c7a19b2a25d2f775528a4fff43a9bdbc2f3c52d
parent29d1dde972acaaf3685b60de3da00c1809c510f9
parenta687045045157eab2dbf657bb085cb0af68d72f2
am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks

* commit 'a687045045157eab2dbf657bb085cb0af68d72f2':
  cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks