| commit | 551a96fbb09043734fe3622cdc49dc161486d79b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu May 06 17:09:47 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 06 17:09:47 2010 -0700 |
| tree | 98c348c0c35ef7ce4442b50dd65b48e610c1ea72 | |
| parent | 60751517acb65abf5a4f5cede844d8932dea9542 [diff] | |
| parent | 0c0d38934844155371b8394ee3aa0137b54cf1f7 [diff] |
am 0c0d3893: am 173de779: am b2520c7f: manual merge from froyo