OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54e01e0 ef5afa0)
am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.
authorMarco Nelissen <marcone@google.com>
Fri, 8 Oct 2010 00:48:46 +0000 (17:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Oct 2010 00:48:46 +0000 (17:48 -0700)
Merge commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f' into gingerbread

* commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f':
  Do not merge.


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