| commit | 42cd1c99c4bd3247233321df2819d36c98b811e4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 03 09:19:26 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 03 09:19:26 2010 -0700 |
| tree | 2ba24ce46d84ec2f615428ff83748f014da47434 | |
| parent | f96e700b338e9a0edee6c2114cc7310f7be48bc4 [diff] | |
| parent | 7bea36bdeb9829a9d7ca4bce18b85c2125668817 [diff] |
am 7bea36bd: am f7e148c1: merge from open-source master