| commit | b3f26be7edb1eae5500409e55200b7f42dcaa035 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon May 17 14:52:46 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 17 14:52:46 2010 -0700 |
| tree | 8b87845e3cd419fbbd134c3e086982fd14c25612 | |
| parent | 5942ccf0d8aa8adfb48b2c0de4e19966553c65a6 [diff] | |
| parent | 453894d816a25bfdea0d6473d51d78b8da8ee7a9 [diff] |
am 453894d8: am 8382068e: merge from open-source master