OSDN Git Service

am ef4b0613: am e9503ef8: am 886130bc: (-s ours) Two patches.
authorAndy McFadden <fadden@android.com>
Tue, 9 Nov 2010 04:00:39 +0000 (20:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Nov 2010 04:00:39 +0000 (20:00 -0800)
* commit 'ef4b0613d6952770aefac07d503955eb7b962d2b':
  Two patches.


Trivial merge