| commit | ffec45d77cad2e8b6ee830d74ae47b709252f2a1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 21 10:57:21 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 21 10:57:21 2010 -0700 |
| tree | 0851a3a055c6d48b314ca731905e7c804f38ee85 | |
| parent | 205591981c6382603d924885a7cefb86017c3949 [diff] | |
| parent | e1fef62bce230b9eb8a2a2c910d593f87e8173be [diff] |
am e1fef62b: (-s ours) merge from froyo-plus-aosp - DO NOT MERGE Merge commit 'e1fef62bce230b9eb8a2a2c910d593f87e8173be' * commit 'e1fef62bce230b9eb8a2a2c910d593f87e8173be': Change branch name to openmaster, to avoid confusion