commit | 24d181f1516c514d3721420b9f60ea11eef44ef5 | [log] [tgz] |
---|---|---|
author | Fred Quintana <fredq@google.com> | Sun Aug 16 17:20:21 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 16 17:20:21 2009 -0700 |
tree | dd51ea840b82b9392ec1772b4c49f48f6c6190e1 | |
parent | 89c4831158f216c7aa0df6d1dc17290a9b380ba9 [diff] | |
parent | 973713447696abaa68f17fb702983a285261c3ba [diff] |
am 106278c4: (-s ours) Merge change 21432 into eclair Merge commit '106278c40271fec941a86e5eac66ae5c8477a56a' * commit '106278c40271fec941a86e5eac66ae5c8477a56a': do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from master branch