OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4d55db3
4bbc09c
)
am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
author
repo sync
<andih@google.com>
Thu, 13 Jan 2011 01:58:48 +0000
(17:58 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 13 Jan 2011 01:58:48 +0000
(17:58 -0800)
* commit '
d439ac396ecb9e909c543424211d563325fea72b
':
DO NOT MERGE: Fix parsing of ntp= PLAY response.
Trivial merge