OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29d1dde a687045)
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)
* commit 'a687045045157eab2dbf657bb085cb0af68d72f2':
  cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help