commit | 4f01c927503401d560cb4f209b7d9a723c32e8cb | [log] [tgz] |
---|---|---|
author | Grace Kloba <klobag@google.com> | Fri Jan 22 13:17:52 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 22 13:17:52 2010 -0800 |
tree | be73af9a10b9ff8ae7fcb2da2dd35b17cf343ba7 | |
parent | 131c5e0867d542788cf2dab23b17f2f8cc3d0391 [diff] | |
parent | 5ff24d5da414db4e8c2ebe98f40976e7be62b72d [diff] |
am 5ff24d5d: DO NOT MERGE Merge commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d' into eclair-plus-aosp * commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d': DO NOT MERGE