| commit | e74e5df5793135fa9b643112ad999f0bb47ce922 | [log] [tgz] |
|---|---|---|
| author | Patrick Scott <phanna@android.com> | Wed Jul 01 14:18:51 2009 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Wed Jul 01 14:18:51 2009 -0700 |
| tree | 70c7abb54d7abd040ed13f4d647a76f27aa68143 | |
| parent | fb02adff73f691c0eeaaa6fddb2b2349f30233a6 [diff] | |
| parent | 7ba1b9e1a023eac627eab4d7b3d29bf4c4c5370b [diff] |
am 7ba1b9e1: (-s ours) Do not merge Merge commit '7ba1b9e1a023eac627eab4d7b3d29bf4c4c5370b' * commit '7ba1b9e1a023eac627eab4d7b3d29bf4c4c5370b': Do not merge