| commit | 4e8ff4775bf8735c1d207c9c77bdd7e6fdf825be | [log] [tgz] |
|---|---|---|
| author | Maarten Hooft <mthooft@google.com> | Tue Jun 21 09:26:20 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 21 09:26:20 2011 -0700 |
| tree | 1ed6eca8ffc74848d178929b08cf799855ee3c49 | |
| parent | 5d716203c3b8d6cf62a130cdd5b281e5772a9564 [diff] | |
| parent | a667e0fbabeac140ff36e3ff415b4a546b692ba4 [diff] |
am a667e0fb: (-s ours) am d0750cb5: Merge "DO NOT MERGE Security fix" into gingerbread * commit 'a667e0fbabeac140ff36e3ff415b4a546b692ba4': DO NOT MERGE Security fix