OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6d18419
846764e
)
am 846764e5: am d3cc051d: am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d...
author
Scott Main
<smain@google.com>
Wed, 29 Jun 2011 04:02:05 +0000
(21:02 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 29 Jun 2011 04:02:05 +0000
(21:02 -0700)
* commit '
846764e5aafc21d2bed9c7fde0b43e9548f96617
':
cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
Trivial merge