tree 7716363d7ea30264fd213f6ce5c62949993d8a6a
parent 5db9ff97aa8f36f330f41f5ae42467795ef075b8
author Scott Main <smain@google.com> 1309317943 -0700
committer Scott Main <smain@google.com> 1309319132 -0700

cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e
docs: fix game controller trademarks

Change-Id: I1eca030bad5bae0c581000fefffd5d3d49aac205