| commit | 763f311072d22b94cb6cae22e28f56ea5999f5b9 | [log] [tgz] |
|---|---|---|
| author | Maarten Hooft <mthooft@google.com> | Thu Jun 23 07:47:22 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 23 07:47:22 2011 -0700 |
| tree | 2f3c93b2fac3b8add8a2508f0662a2d53baca7fa | |
| parent | 0b3165d365baa066465f5ae95d93feeec75a0ef3 [diff] | |
| parent | 4e8ff4775bf8735c1d207c9c77bdd7e6fdf825be [diff] |
am 4e8ff477: (-s ours) am a667e0fb: (-s ours) am d0750cb5: Merge "DO NOT MERGE Security fix" into gingerbread * commit '4e8ff4775bf8735c1d207c9c77bdd7e6fdf825be': DO NOT MERGE Security fix