| commit | 2ddc27d0df310a21d96a998151933fab6b2e156d | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 03 09:21:28 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 03 09:21:28 2010 -0700 |
| tree | b673d9b95ab66a0c1e9b006f483ea0c2fe9493da | |
| parent | 42cd1c99c4bd3247233321df2819d36c98b811e4 [diff] | |
| parent | f1a4618e99b26a588e15e8c467b21b3a1df74f64 [diff] |
am f1a4618e: am 324a98f1: merge from open-source master