commit | 483555c333027aa9c7281817d7b6a505bf69cbe7 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 12 17:00:50 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 12 17:00:50 2010 -0700 |
tree | d3dd36fd871afecf6764ce81adf1644380772490 | |
parent | 799c5cad63eb8eb960b044d44d1e6aa1ebd6939a [diff] | |
parent | 19495e9285a2ca1a10103c0ef5d8fab27858c8d6 [diff] |
am 19495e92: merge from open-source master