OSDN Git Service

am e8dc977d: (-s ours) Do not merge.
authorPatrick Scott <phanna@android.com>
Wed, 15 Jul 2009 20:41:45 +0000 (13:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2009 20:41:45 +0000 (13:41 -0700)
Merge commit 'e8dc977d91b95b3b3f56ffdadebeba4a04001200'

* commit 'e8dc977d91b95b3b3f56ffdadebeba4a04001200':
  Do not merge.


Trivial merge