commit | db7dd6b5089ea1284748e1f85afc1e48cefbae7d | [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 | b5acc89b28d61bc57b2a3ec69b0a0c987d23df2f | |
parent | bdf0259f83edb7e5dd2d4b4e40145342c11ea425 [diff] | |
parent | 106278c40271fec941a86e5eac66ae5c8477a56a [diff] |
am 106278c4: (-s ours) Merge change 21432 into eclair Merge commit '106278c40271fec941a86e5eac66ae5c8477a56a' * commit '106278c40271fec941a86e5eac66ae5c8477a56a': do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from master branch