| commit | 61ef50bb775712606728bb27be38157b467218d5 | [log] [tgz] |
|---|---|---|
| author | Grace Kloba <klobag@google.com> | Thu Jan 21 17:57:07 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 21 17:57:07 2010 -0800 |
| tree | 1dc31e39fbe875c4e05888b219aad32f9958e1ff | |
| parent | 01752fe46bbf06c63de57c3a1d9444c292a64e38 [diff] | |
| parent | 55d791e74eaa8c80b965075d6debc1cfd7bde99a [diff] |
am 55d791e7: (-s ours) am 5a0bf1f0: DO NOT MERGE Merge commit '55d791e74eaa8c80b965075d6debc1cfd7bde99a' * commit '55d791e74eaa8c80b965075d6debc1cfd7bde99a': DO NOT MERGE