OSDN Git Service

am 020e2fc1: (-s ours) am 928a0304: re-merge from readonly-korg-master - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Thu, 27 Jan 2011 17:26:44 +0000 (09:26 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Jan 2011 17:26:44 +0000 (09:26 -0800)
* commit '020e2fc14a28d6fd449fa37cf8bcbd4b0675238a':
  re-merge from readonly-korg-master - do not merge


Trivial merge