commit | eefd63e3579c0de1c8a3bb737c6dd28668251b63 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 04 13:02:38 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 04 13:02:38 2010 -0700 |
tree | 0eeb9270bdf4c09a0f52acaafee0ad21c6e14a5a | |
parent | d2cecfd3759d6785c5a2ed3f2f35fa1a30f757db [diff] | |
parent | 0a0c57f929be1e37ccf32d27b5b7123684d0f0d7 [diff] |
am 0a0c57f9: am 7c035d8a: am 2d743fe2: merge from open-source master