OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df8ae2a 8950fab)
am eb43f1b2: am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging...
authorMarco Nelissen <marcone@google.com>
Fri, 8 Oct 2010 00:52:15 +0000 (17:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Oct 2010 00:52:15 +0000 (17:52 -0700)
Merge commit 'eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513' into gingerbread-plus-aosp

* commit 'eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513':
  Do not merge.


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