| commit | f95a61746e72ba6fce6afb5b94f2ff051af681b9 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Thu Jan 28 10:47:15 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 28 10:47:15 2010 -0800 |
| tree | 6c1356e498c94d400772119346904e1351c49fc4 | |
| parent | f1a0f55f7145bc3c769752395d29b282f1f133f2 [diff] | |
| parent | 4f01c927503401d560cb4f209b7d9a723c32e8cb [diff] |
am 4f01c927: (-s ours) am 5ff24d5d: DO NOT MERGE Merge commit '4f01c927503401d560cb4f209b7d9a723c32e8cb' * commit '4f01c927503401d560cb4f209b7d9a723c32e8cb': DO NOT MERGE