commit | 1331ded8fe1ead9271bb60a41d7364a375d7f298 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu May 13 14:57:20 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 13 14:57:20 2010 -0700 |
tree | b89399e174fa0d02011f98def0cb612d8c1dcc0b | |
parent | 702b8752a5038dc307dc77d157124204f8ad8aa4 [diff] | |
parent | e28776bbd72397eea0dd24f5c28273fb2bf1a2f0 [diff] |
am e28776bb: am b1110149: merge from open-source master