| commit | d3579e29304713a395bac581e96201db3a346287 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Jun 28 21:02:05 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 28 21:02:05 2011 -0700 |
| tree | 21235ee8621b36259dcae25f6dc20b5bda436d5c | |
| parent | b4324610d990127ce29a140d1dd9acac2be438c1 [diff] | |
| parent | ae9124dc54286ecffd9a5054555478368b3287f3 [diff] |
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