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:
82314ae
1dbce5f
)
am 1dbce5f1: am 05ab277c: am fa4865f6: resolved conflicts for merge of 0b479e43 to...
author
Katie McCormick
<kmccormick@google.com>
Wed, 10 Oct 2012 23:12:06 +0000
(16:12 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 10 Oct 2012 23:12:06 +0000
(16:12 -0700)
* commit '
1dbce5f1e55bdc61a767cd82b59a3919a4683b5e
':
Doc changes: misc GCM updates.
Trivial merge