OSDN Git Service

am aaeab75e: (-s ours) am 8d58816a: (-s ours) Do not merge. Revert "Do not merge."
authorPatrick Scott <phanna@android.com>
Wed, 19 Aug 2009 23:49:16 +0000 (16:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 Aug 2009 23:49:16 +0000 (16:49 -0700)
Merge commit 'aaeab75eee4f56fe6c3b4809a4be556273463cf1'

* commit 'aaeab75eee4f56fe6c3b4809a4be556273463cf1':
  Do not merge.


Trivial merge