| commit | 0c0d38934844155371b8394ee3aa0137b54cf1f7 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu May 06 16:34:39 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 06 16:34:39 2010 -0700 |
| tree | 98c348c0c35ef7ce4442b50dd65b48e610c1ea72 | |
| parent | d6bec8333d444a5159b9f7244831487fc4f94036 [diff] | |
| parent | 173de779e1d3a9c2372ef6b359e1a45fabda6dba [diff] |
am 173de779: am b2520c7f: manual merge from froyo