OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d55db3 4bbc09c)
am d439ac39: resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp
authorrepo sync <andih@google.com>
Thu, 13 Jan 2011 01:58:48 +0000 (17:58 -0800)
committerAndroid 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
frameworks/native
About OSDN
Find Software
Develop Software
Help