commit | 1c00e57ca52fefd0b4ca5085a8586f53fd48277e | [log] [tgz] |
---|---|---|
author | Bart Sears <bsears@google.com> | Wed Feb 10 09:24:14 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 10 09:24:14 2010 -0800 |
tree | 2bb350a719caf06727a410ce662c46a28c45fb72 | |
parent | 117818e4f171b1fd9daa05349c48f61388f04567 [diff] | |
parent | 789b11c715af48a0379b8b1f90d7a829ac6a8145 [diff] |
am 789b11c7: (-s ours) am 926780b0: Merge "DO NOT MERGE" into eclair Merge commit '789b11c715af48a0379b8b1f90d7a829ac6a8145' * commit '789b11c715af48a0379b8b1f90d7a829ac6a8145': DO NOT MERGE