| commit | f69d9a220c49fc147af6446dbf7169e0177b4362 | [log] [tgz] |
|---|---|---|
| author | Fred Quintana <fredq@google.com> | Sun Aug 16 17:20:14 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Aug 16 17:20:14 2009 -0700 |
| tree | b6626281df3028bd1bd062ffbe394bc0139bad8e | |
| parent | a076d0dbd1d1afa7695150fddc8f9aae414f4c5d [diff] | |
| parent | bb57ac8ccfa18c7df38f42f519821c0083875abf [diff] |
am bb57ac8c: (-s ours) do not merge: cherrypicked a83a03bbf0a7480c856d102a2b3a7f823ac4566b and a076d0dbd1d1afa7695150fddc8f9aae414f4c5d from master branch Merge commit 'bb57ac8ccfa18c7df38f42f519821c0083875abf' * commit 'bb57ac8ccfa18c7df38f42f519821c0083875abf': do not merge: cherrypicked a83a03bbf0a7480c856d102a2b3a7f823ac4566b and a076d0dbd1d1afa7695150fddc8f9aae414f4c5d from master branch