OSDN Git Service

am 5ff24d5d: DO NOT MERGE
authorGrace Kloba <klobag@google.com>
Fri, 22 Jan 2010 21:17:52 +0000 (13:17 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Jan 2010 21:17:52 +0000 (13:17 -0800)
commit4f01c927503401d560cb4f209b7d9a723c32e8cb
treebe73af9a10b9ff8ae7fcb2da2dd35b17cf343ba7
parent131c5e0867d542788cf2dab23b17f2f8cc3d0391
parent5ff24d5da414db4e8c2ebe98f40976e7be62b72d
am 5ff24d5d: DO NOT MERGE

Merge commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d' into eclair-plus-aosp

* commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d':
  DO NOT MERGE