| commit | 206edb637f0331fe26f3e90d847b15d67704e7ad | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu May 06 16:34:42 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 06 16:34:42 2010 -0700 |
| tree | 8a18f6d82aaeb2cfaedd7774edaaa32bc41785f0 | |
| parent | 0c0d38934844155371b8394ee3aa0137b54cf1f7 [diff] | |
| parent | 71c9526e5d02c5aeb76d96082aff5067db23a250 [diff] |
am 71c9526e: am 99632b11: manual merge from froyo