| commit | ac2a358546cf2b5bab43a39eb40549d31932c64d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu May 06 17:09:49 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 06 17:09:49 2010 -0700 |
| tree | 8a18f6d82aaeb2cfaedd7774edaaa32bc41785f0 | |
| parent | 551a96fbb09043734fe3622cdc49dc161486d79b [diff] | |
| parent | 206edb637f0331fe26f3e90d847b15d67704e7ad [diff] |
am 206edb63: am 71c9526e: am 99632b11: manual merge from froyo