| commit | da9a8535b06200932aa7cb26697a9da24f7d688e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 14 14:38:37 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 14 14:38:37 2010 -0700 |
| tree | 9253617bfd03b8a8115ead6dd2ed807612e1bf76 | |
| parent | ce88086cc425b33e0c389dc9a233e5a72acf6833 [diff] | |
| parent | 216d8448a04f3c7794d1e4ec1178a2bf6da2ba95 [diff] |
am 216d8448: am 95f862bc: merge from open-source master