commit | 93c90df092097e272ff5cdab2473fee37be9cc27 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Jun 09 16:12:11 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 09 16:12:11 2010 -0700 |
tree | aecc36107b30f13a3f85fc8ceb9edc137d787950 | |
parent | ad6b91320d48ce5e65f6a1d399c6d22d99a3f9f1 [diff] | |
parent | 1a62198e28ec9f29ffbcf51ac6c5c885c37642bf [diff] |
am 030b0ebe: merge from froyo-plus-aosp